ruleset-sources: Add additional providers.

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

diff --git a/make.sh b/make.sh
index 2b89eb4ec67daabac5b7b826bb9273f4f8309063..e6f948ba073c14ca05f3374d620263fcb2990f7d 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="161"                                                     # Core Level (Filename)
+CORE="162"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop
@@ -1128,8 +1128,7 @@ buildbase() {
        lfsmake2 gperf
        lfsmake2 gzip
        lfsmake2 hostname
-       lfsmake2 iproute2
-       lfsmake2 jwhois
+       lfsmake2 whois
        lfsmake2 kbd
        lfsmake2 less
        lfsmake2 pkg-config
@@ -1190,6 +1189,7 @@ buildipfire() {
   lfsmake2 libnetfilter_cthelper
   lfsmake2 libnetfilter_cttimeout
   lfsmake2 iptables
+  lfsmake2 iproute2
   lfsmake2 screen
   lfsmake2 elfutils
 
@@ -1198,6 +1198,7 @@ buildipfire() {
   lfsmake2 linux               KCFG=""
   lfsmake2 rtl8189es           KCFG=""
   lfsmake2 rtl8812au           KCFG=""
+  lfsmake2 rtl8822bu           KCFG=""
   lfsmake2 xradio              KCFG=""
   lfsmake2 xtables-addons      KCFG=""
   lfsmake2 linux-initrd                KCFG=""
@@ -1216,6 +1217,7 @@ buildipfire() {
   lfsmake2 aprutil
   lfsmake2 unbound
   lfsmake2 gnutls
+  lfsmake2 libuv
   lfsmake2 bind
   lfsmake2 dhcp
   lfsmake2 dhcpcd
@@ -1228,7 +1230,6 @@ buildipfire() {
   lfsmake2 tcl
   lfsmake2 sqlite
   lfsmake2 libffi
-  lfsmake2 python
   lfsmake2 python3
   lfsmake2 gdb
   lfsmake2 grub
@@ -1277,6 +1278,7 @@ buildipfire() {
   lfsmake2 libinih
   lfsmake2 cdrkit
   lfsmake2 dosfstools
+  lfsmake2 exfatprogs
   lfsmake2 reiserfsprogs
   lfsmake2 xfsprogs
   lfsmake2 sysfsutils
@@ -1284,6 +1286,7 @@ buildipfire() {
   lfsmake2 ntfs-3g
   lfsmake2 ethtool
   lfsmake2 fcron
+  lfsmake2 ExtUtils-PkgConfig
   lfsmake2 perl-GD
   lfsmake2 GD-Graph
   lfsmake2 GD-TextUtil
@@ -1511,7 +1514,6 @@ buildipfire() {
   lfsmake2 zerofree
   lfsmake2 minicom
   lfsmake2 ddrescue
-  lfsmake2 client175
   lfsmake2 powertop
   lfsmake2 parted
   lfsmake2 swig
@@ -1612,6 +1614,7 @@ buildipfire() {
   lfsmake2 socat
   lfsmake2 libcdada
   lfsmake2 pmacct
+  lfsmake2 squid-asnbl
 }
 
 buildinstaller() {
@@ -1903,24 +1906,24 @@ gettoolchain)
        fi
        ;;
 uploadsrc)
-       PWD=`pwd`
        if [ -z $IPFIRE_USER ]; then
                echo -n "You have to setup IPFIRE_USER first. See .config for details."
                print_status FAIL
                exit 1
        fi
 
-       URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-       REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+       URL_SOURCE="$(awk '/^URL_SOURCE/ { print $3 }' lfs/Config)"
+
+       rsync \
+               --recursive \
+               --update \
+               --ignore-existing \
+               --progress \
+               --human-readable \
+               --exclude="toolchains/" \
+               "${BASEDIR}/cache/" \
+               "${IPFIRE_USER}@${URL_SOURCE}"
 
-       for file in ${BASEDIR}/cache/*; do
-               [ -d "${file}" ] && continue
-               grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue
-               NEW_FILES="$NEW_FILES $file"
-       done
-       [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}
-       cd $BASEDIR
-       cd $PWD
        exit 0
        ;;
 lang)
@@ -1959,8 +1962,18 @@ find-dependencies)
        shift
        exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@"
        ;;
+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
+       else
+               print_status FAIL
+       fi
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}"
+       echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies|check-manualpages}"
        cat doc/make.sh-usage
        ;;
 esac