ddns: Import latest upstream patches for ddns-013

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

diff --git a/make.sh b/make.sh
index f51a95d67ed3e7a09e680fced18b24395102574d..ce582273607b3ecef8b09e1da92aad9b0265922f 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-2019 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -27,7 +27,6 @@ SNAME="ipfire"                                                        # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
 CORE="142"                                                     # Core Level (Filename)
-PAKFIRE_CORE="141"                                             # Core Level (PAKFIRE)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -557,7 +556,6 @@ enterchroot() {
                PS1="${PS1}" \
                PATH="${PATH}" \
                SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
-               PAKFIRE_CORE="${PAKFIRE_CORE}" \
                PAKFIRE_TREE="${PAKFIRE_TREE}" \
                NAME="${NAME}" \
                SNAME="${SNAME}" \
@@ -1360,7 +1358,6 @@ buildipfire() {
   lfsmake2 cairo
   lfsmake2 pango
   lfsmake2 rrdtool
-  lfsmake2 setserial
   lfsmake2 setup
   lfsmake2 libdnet
   lfsmake2 rust
@@ -1509,7 +1506,6 @@ buildipfire() {
   lfsmake2 iperf3
   lfsmake2 7zip
   lfsmake2 lynis
-  lfsmake2 streamripper
   lfsmake2 sshfs
   lfsmake2 taglib
   lfsmake2 sslh
@@ -1539,7 +1535,6 @@ buildipfire() {
   lfsmake2 parted
   lfsmake2 swig
   lfsmake2 u-boot
-  lfsmake2 u-boot-kirkwood
   lfsmake2 u-boot-friendlyarm
   lfsmake2 python-typing
   lfsmake2 python-m2crypto
@@ -1617,7 +1612,6 @@ buildipfire() {
   lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
-  lfsmake2 rtpproxy
   lfsmake2 util-macros
   lfsmake2 libpciaccess
   lfsmake2 libyajl