Revert "ruleset-sources: Remove support for PT Attack Team Detection rules."

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 9b94e9932c67f3e1253236b3de783ae99f5393df..2abd5750ca0118b807d278d4b5907cfb9bbf9d89 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.27"                                                 # Version number
-CORE="165"                                                     # Core Level (Filename)
+CORE="166"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop
@@ -295,10 +295,6 @@ stdumount() {
        umount $BASEDIR/build/tmp               2>/dev/null;
 }
 
-now() {
-       date -u "+%s"
-}
-
 format_runtime() {
        local seconds=${1}
 
@@ -437,7 +433,7 @@ prepareenv() {
        fi
 
        # Trap on emergency exit
-       trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGSTOP SIGQUIT
+       trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGQUIT
 
        # Checking if running as root user
        if [ $(id -u) -ne 0 ]; then
@@ -547,7 +543,7 @@ prepareenv() {
        esac
 
        # Setup ccache cache size
-       enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null
+       enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}"
 }
 
 enterchroot() {
@@ -741,7 +737,7 @@ ipfiredist() {
 wait_until_finished() {
        local pid=${1}
 
-       local start_time=$(now)
+       local start_time="${SECONDS}"
 
        # Show progress
        if ${INTERACTIVE}; then
@@ -751,7 +747,7 @@ wait_until_finished() {
 
                local runtime
                while kill -0 ${pid} 2>/dev/null; do
-                       print_runtime $(( $(now) - ${start_time} ))
+                       print_runtime $(( SECONDS - start_time ))
 
                        # Wait a little
                        sleep 1
@@ -763,7 +759,7 @@ wait_until_finished() {
        local ret=$?
 
        if ! ${INTERACTIVE}; then
-               print_runtime $(( $(now) - ${start_time} ))
+               print_runtime $(( SECONDS - start_time ))
        fi
 
        return ${ret}
@@ -785,7 +781,7 @@ fake_environ() {
 }
 
 qemu_environ() {
-       local env
+       local env="QEMU_TARGET_HELPER=${QEMU_TARGET_HELPER}"
 
        # Don't add anything if qemu is not used.
        if ! qemu_is_required; then
@@ -797,6 +793,11 @@ qemu_environ() {
                arm*)
                        QEMU_CPU="${QEMU_CPU:-cortex-a9}"
 
+                       env="${env} QEMU_CPU=${QEMU_CPU}"
+                       ;;
+               riscv64)
+                       QEMU_CPU="${QEMU_CPU:-sifive-u54}"
+
                        env="${env} QEMU_CPU=${QEMU_CPU}"
                        ;;
        esac
@@ -912,7 +913,7 @@ qemu_find_build_helper_name() {
 file_is_static() {
        local file="${1}"
 
-       file ${file} 2>/dev/null | grep -q "statically linked"
+       file -L "${file}" 2>/dev/null | grep -q "statically linked"
 }
 
 update_language_list() {
@@ -1094,6 +1095,8 @@ buildbase() {
        lfsmake2 libxcrypt
        lfsmake2 file
        lfsmake2 gcc
+       lfsmake2 attr
+       lfsmake2 acl
        lfsmake2 sed
        lfsmake2 berkeley
        lfsmake2 coreutils
@@ -1109,8 +1112,6 @@ buildbase() {
        lfsmake2 pcre
        lfsmake2 pcre2
        lfsmake2 gettext
-       lfsmake2 attr
-       lfsmake2 acl
        lfsmake2 bash
        lfsmake2 diffutils
        lfsmake2 ed
@@ -1150,6 +1151,7 @@ buildipfire() {
   lfsmake2 configroot
   lfsmake2 initscripts
   lfsmake2 backup
+  lfsmake2 rust
   lfsmake2 openssl
   lfsmake2 kmod
   lfsmake2 udev
@@ -1193,13 +1195,12 @@ buildipfire() {
   # multi kernel builds so KCFG is empty
   lfsmake2 linux               KCFG=""
   lfsmake2 rtl8189es           KCFG=""
+  lfsmake2 rtl8189fs           KCFG=""
   lfsmake2 rtl8812au           KCFG=""
   lfsmake2 rtl8822bu           KCFG=""
   lfsmake2 xradio              KCFG=""
-  lfsmake2 xtables-addons      KCFG=""
   lfsmake2 linux-initrd                KCFG=""
 
-  lfsmake2 xtables-addons      USPACE="1"
   lfsmake2 libgpg-error
   lfsmake2 libgcrypt
   lfsmake2 libassuan
@@ -1344,7 +1345,7 @@ buildipfire() {
   lfsmake2 usbutils
   lfsmake2 libxml2
   lfsmake2 libxslt
-  lfsmake2 BerkeleyDB
+  lfsmake2 perl-BerkeleyDB
   lfsmake2 cyrus-sasl
   lfsmake2 openldap
   lfsmake2 apache2
@@ -1367,10 +1368,10 @@ buildipfire() {
   lfsmake2 ntfs-3g
   lfsmake2 ethtool
   lfsmake2 fcron
-  lfsmake2 ExtUtils-PkgConfig
+  lfsmake2 perl-ExtUtils-PkgConfig
   lfsmake2 perl-GD
-  lfsmake2 GD-Graph
-  lfsmake2 GD-TextUtil
+  lfsmake2 perl-GD-Graph
+  lfsmake2 perl-GD-TextUtil
   lfsmake2 perl-Device-SerialPort
   lfsmake2 perl-Device-Modem
   lfsmake2 perl-Apache-Htpasswd
@@ -1378,6 +1379,7 @@ buildipfire() {
   lfsmake2 perl-Data-UUID
   lfsmake2 perl-Try-Tiny
   lfsmake2 perl-HTTP-Message
+  lfsmake2 perl-HTTP-Date
   lfsmake2 gnupg
   lfsmake2 hdparm
   lfsmake2 sdparm
@@ -1391,35 +1393,37 @@ buildipfire() {
   lfsmake2 logwatch
   lfsmake2 misc-progs
   lfsmake2 nano
-  lfsmake2 URI
+  lfsmake2 perl-URI
   lfsmake2 perl-CGI
   lfsmake2 perl-Switch
-  lfsmake2 HTML-Tagset
-  lfsmake2 HTML-Parser
-  lfsmake2 HTML-Template
-  lfsmake2 Compress-Zlib
-  lfsmake2 Digest
-  lfsmake2 Digest-SHA1
-  lfsmake2 Digest-HMAC
-  lfsmake2 libwww-perl
-  lfsmake2 Net-DNS
-  lfsmake2 Net-IPv4Addr
-  lfsmake2 Net_SSLeay
-  lfsmake2 IO-Stringy
-  lfsmake2 IO-Socket-SSL
-  lfsmake2 Unix-Syslog
-  lfsmake2 Mail-Tools
-  lfsmake2 MIME-Tools
-  lfsmake2 Net-Server
-  lfsmake2 Canary-Stability
-  lfsmake2 Convert-TNEF
-  lfsmake2 Convert-UUlib
-  lfsmake2 Archive-Tar
-  lfsmake2 Archive-Zip
-  lfsmake2 Text-Tabs+Wrap
-  lfsmake2 XML-Parser
-  lfsmake2 Crypt-PasswdMD5
-  lfsmake2 Net-Telnet
+  lfsmake2 perl-HTML-Tagset
+  lfsmake2 perl-HTML-Parser
+  lfsmake2 perl-HTML-Template
+  lfsmake2 perl-Compress-Zlib
+  lfsmake2 perl-Digest
+  lfsmake2 perl-Digest-SHA1
+  lfsmake2 perl-Digest-HMAC
+  lfsmake2 perl-libwww
+       lfsmake2 perl-LWP-Protocol-https
+  lfsmake2 perl-Net-HTTP
+  lfsmake2 perl-Net-DNS
+  lfsmake2 perl-Net-IPv4Addr
+  lfsmake2 perl-Net_SSLeay
+  lfsmake2 perl-IO-Stringy
+  lfsmake2 perl-IO-Socket-SSL
+  lfsmake2 perl-Unix-Syslog
+  lfsmake2 perl-Mail-Tools
+  lfsmake2 perl-MIME-Tools
+  lfsmake2 perl-Net-Server
+  lfsmake2 perl-Canary-Stability
+  lfsmake2 perl-Convert-TNEF
+  lfsmake2 perl-Convert-UUlib
+  lfsmake2 perl-Archive-Tar
+  lfsmake2 perl-Archive-Zip
+  lfsmake2 perl-Text-Tabs+Wrap
+  lfsmake2 perl-XML-Parser
+  lfsmake2 perl-Crypt-PasswdMD5
+  lfsmake2 perl-Net-Telnet
   lfsmake2 python3-setuptools
   lfsmake2 python3-inotify
   lfsmake2 python3-docutils
@@ -1446,7 +1450,6 @@ buildipfire() {
   lfsmake2 ragel
   lfsmake2 hyperscan
   lfsmake2 suricata
-  lfsmake2 oinkmaster
   lfsmake2 ids-ruleset-sources
   lfsmake2 squid
   lfsmake2 squidguard
@@ -1606,7 +1609,24 @@ buildipfire() {
   lfsmake2 wireless-regdb
   lfsmake2 libsolv
   lfsmake2 ddns
+  lfsmake2 python3-pycparser
+  lfsmake2 python3-charset-normalizer
+  lfsmake2 python3-certifi
+  lfsmake2 python3-idna
+  lfsmake2 python3-requests
+  lfsmake2 python3-toml
+  lfsmake2 python3-pyproject2setuppy
+  lfsmake2 python3-tomli
+  lfsmake2 python3-pep517
+  lfsmake2 python3-build
+  lfsmake2 python3-install
+  lfsmake2 python3-urllib3
+  lfsmake2 python3-flit
+  lfsmake2 python3-packaging
+  lfsmake2 python3-typing-extensions
+  lfsmake2 python3-semantic-version
   lfsmake2 python3-setuptools-scm
+  lfsmake2 python3-setuptools-rust
   lfsmake2 python3-six
   lfsmake2 python3-dateutil
   lfsmake2 python3-jmespath
@@ -1615,10 +1635,17 @@ buildipfire() {
   lfsmake2 python3-s3transfer
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
-  lfsmake2 python3-urllib3
   lfsmake2 python3-botocore
-  lfsmake2 python3-msgpack
+  lfsmake2 python3-cffi
+  lfsmake2 python3-cryptography
+  lfsmake2 python3-circuitbreaker
+  lfsmake2 python3-pytz
+  lfsmake2 python3-click
+  lfsmake2 python3-arrow
+  lfsmake2 python3-terminaltables
   lfsmake2 aws-cli
+  lfsmake2 oci-python-sdk
+  lfsmake2 oci-cli
   lfsmake2 transmission
   lfsmake2 mtr
   lfsmake2 minidlna
@@ -1651,7 +1678,7 @@ buildipfire() {
   lfsmake2 perl-Font-TTF
   lfsmake2 perl-IO-String
   lfsmake2 perl-PDF-API2
-  lfsmake2 squid-accounting
+  lfsmake2 proxy-accounting
   lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
@@ -1698,6 +1725,7 @@ buildipfire() {
   lfsmake2 pmacct
   lfsmake2 squid-asnbl
   lfsmake2 qemu-ga
+       lfsmake2 gptfdisk
 }
 
 buildinstaller() {
@@ -1715,7 +1743,7 @@ buildpackages() {
   export LOGFILE
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
 
-  
+
   # Generating list of packages used
   print_line "Generating packages list from logs"
   rm -f $BASEDIR/doc/packages-list
@@ -1730,7 +1758,7 @@ buildpackages() {
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
   print_status DONE
-  
+
   # Update changelog
   cd $BASEDIR
   [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG
@@ -1802,9 +1830,9 @@ while [ $# -gt 0 ]; do
 done
 
 # See what we're supposed to do
-case "$1" in 
+case "$1" in
 build)
-       START_TIME=$(now)
+       START_TIME="${SECONDS}"
 
        # Clear screen
        ${INTERACTIVE} && clear
@@ -1841,7 +1869,7 @@ build)
 
        print_build_stage "Building packages"
        buildpackages
-       
+
        print_build_stage "Checking Logfiles for new Files"
 
        cd $BASEDIR
@@ -1849,7 +1877,7 @@ build)
        tools/checkrootfiles
        cd $PWD
 
-       print_build_summary $(( $(now) - ${START_TIME} ))
+       print_build_summary $(( SECONDS - START_TIME ))
        ;;
 shell)
        # enter a shell inside LFS chroot
@@ -1906,7 +1934,7 @@ downloadsrc)
        FINISHED=0
        cd $BASEDIR/lfs
        for c in `seq $MAX_RETRIES`; do
-               if (( FINISHED==1 )); then 
+               if (( FINISHED==1 )); then
                        break
                fi
                FINISHED=1
@@ -2047,7 +2075,7 @@ find-dependencies)
        ;;
 check-manualpages)
        echo "Checking the manual pages for broken links..."
-       
+
        chmod 755 $BASEDIR/tools/check_manualpages.pl
        if $BASEDIR/tools/check_manualpages.pl; then
                print_status DONE
@@ -2060,4 +2088,3 @@ check-manualpages)
        cat doc/make.sh-usage
        ;;
 esac
-