core129: Ship updated OpenVPN

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

diff --git a/make.sh b/make.sh
index fb529b669c42fd171b57db9cc9fd2c2b2508b619..8bafd86f97ca3310c432ffedd6773c8adcbaaf4f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.21"                                                 # Version number
-CORE="127"                                                     # Core Level (Filename)
-PAKFIRE_CORE="126"                                             # Core Level (PAKFIRE)
+CORE="129"                                                     # Core Level (Filename)
+PAKFIRE_CORE="128"                                             # 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
@@ -290,9 +290,6 @@ stdumount() {
        umount $BASEDIR/build/usr/src/lfs               2>/dev/null;
        umount $BASEDIR/build/usr/src/log               2>/dev/null;
        umount $BASEDIR/build/usr/src/src               2>/dev/null;
-
-       # Umount ramdisk
-       ramdisk_save "${BASEDIR}/build"
 }
 
 now() {
@@ -426,68 +423,6 @@ exiterror() {
        exit 1
 }
 
-ramdisk_save() {
-       local path="${1}"
-
-       # Check if the ramdisk is actually mounted
-       if ! mountpoint "${path}" &>/dev/null; then
-               return 1
-       fi
-
-       # Remove the bind-mount
-       umount "${path}"
-
-       echo -n "Saving ramdisk (this might take a moment)..."
-
-       # Copy all data
-       mkdir -p "${path}.tmpfs"
-       if ! rsync -aHAXq --delete "${path}.tmpfs/" "${path}/"; then
-               print_status FAIL
-               return 1
-       fi
-
-       # Umount ramdisk
-       umount "${path}.tmpfs"
-       rm -rf "${path}.tmpfs"
-
-       print_status DONE
-}
-
-ramdisk_restore() {
-       local path="${1}"
-
-       # Don't do anything if ramdisk support isn't enabled
-       if [ "${USE_RAMDISK}" != "1" ]; then
-               return 1
-       fi
-
-       # Check for sufficient memory
-       # XXX TODO
-
-       echo -n "Restoring ramdisk (this might take a moment)..."
-
-       # Mount new ramdisk
-       mkdir -p "${path}.tmpfs"
-       if ! mount -t tmpfs none "${path}.tmpfs"; then
-               exiterror "Could not mount ramdisk"
-       fi
-
-       # Restore all data
-       if ! rsync -aHAXq --delete "${path}/" "${path}.tmpfs/"; then
-               umount "${path}.tmpfs"
-               rm -rf "${path}.tmpfs"
-
-               exiterror "Could not restore ramdisk"
-       fi
-
-       # Overlay the files on disk
-       # We would use "mount --move ..." but systemd is always
-       # mounting / as shared which doesn't allow moving anything
-       mount --bind "${path}.tmpfs" "${path}"
-
-       print_status DONE
-}
-
 prepareenv() {
        # Are we running the right shell?
        if [ -z "${BASH}" ]; then
@@ -537,9 +472,6 @@ prepareenv() {
        export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
-       # Mount ramdisk (if requested)
-       ramdisk_restore "${BASEDIR}/build"
-
        # Make some extra directories
        mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null
        mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
@@ -1155,7 +1087,6 @@ buildipfire() {
   lfsmake2 backup
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
-  lfsmake2 openssl-compat
   lfsmake2 popt
   lfsmake2 libusb
   lfsmake2 libusb-compat
@@ -1502,6 +1433,7 @@ buildipfire() {
   lfsmake2 mpd
   lfsmake2 libmpdclient
   lfsmake2 mpc
+  lfsmake2 perl-Net-CIDR-Lite
   lfsmake2 perl-Net-SMTP-SSL
   lfsmake2 perl-MIME-Base64
   lfsmake2 perl-Authen-SASL
@@ -1568,6 +1500,8 @@ buildipfire() {
   lfsmake2 python-progressbar
   lfsmake2 python-xattr
   lfsmake2 ddns
+  lfsmake2 python3-setuptools
+  lfsmake2 python3-setuptools-scm
   lfsmake2 python3-six
   lfsmake2 python3-dateutil
   lfsmake2 python3-jmespath
@@ -1578,6 +1512,8 @@ buildipfire() {
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
   lfsmake2 python3-botocore
+  lfsmake2 python3-llfuse
+  lfsmake2 python3-msgpack
   lfsmake2 aws-cli
   lfsmake2 transmission
   lfsmake2 dpfhack
@@ -1651,6 +1587,9 @@ buildipfire() {
   lfsmake2 nss-myhostname
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
+  lfsmake2 borgbackup
+  lfsmake2 libedit
+  lfsmake2 knot
 }
 
 buildinstaller() {