14 files changed, 79 insertions, 35 deletions
diff --git a/source/n/FTBFSlog b/source/n/FTBFSlog
index 33b29a9a6..b56c4454e 100644
--- a/source/n/FTBFSlog
+++ b/source/n/FTBFSlog
@@ -1,3 +1,14 @@
+Sat Jan 16 18:41:31 UTC 2021
+  dhcp: add -fcommon to CFLAGS.
+  gnupg: add -fcommon to CFLAGS.
+  iftop: add -fcommon to CFLAGS.
+  ncftp: add -fcommon to CFLAGS.
+  netwatch: add -fcommon to CFLAGS.
+  nn: add -fcommon to CFLAGS.
+  tftp-hpa: add -fcommon to CFLAGS.
+  vsftpd: add patch from BLFS for gcc >= 10.1.x.
+  Thanks to nobodino.
++--------------------------+
 Tue Jan 14 04:36:39 UTC 2020
   nfs-utils: add nfs-utils.2.4.3-rc2.patch to fix failure to rebuild on 32-bit.
 +--------------------------+
diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild
index c8e19dd69..84ca46a6e 100755
--- a/source/n/ModemManager/ModemManager.SlackBuild
+++ b/source/n/ModemManager/ModemManager.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for ModemManager
 
 # Copyright 2010, 2011  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,8 +28,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ModemManager
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -70,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/n/dhcp/dhcp.SlackBuild b/source/n/dhcp/dhcp.SlackBuild
index 54f44fb5d..10ddf6cd6 100755
--- a/source/n/dhcp/dhcp.SlackBuild
+++ b/source/n/dhcp/dhcp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2017, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -54,16 +54,16 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-dhcp
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fcommon"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
   LIBDIRSUFFIX=""
 fi
 
diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild
index 10b4a7b1c..52b426e58 100755
--- a/source/n/gnupg/gnupg.SlackBuild
+++ b/source/n/gnupg/gnupg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2016, 2018, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -50,13 +50,13 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-gnupg
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fcommon"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
 fi
 
 rm -rf $PKG
diff --git a/source/n/iftop/iftop.SlackBuild b/source/n/iftop/iftop.SlackBuild
index 6f4b353bd..c4a9e1655 100755
--- a/source/n/iftop/iftop.SlackBuild
+++ b/source/n/iftop/iftop.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2012, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -52,16 +52,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fcommon"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
   LIBDIRSUFFIX=""
 fi
 
diff --git a/source/n/inetd/inetd.SlackBuild b/source/n/inetd/inetd.SlackBuild
index 27978bf53..5eca89c21 100755
--- a/source/n/inetd/inetd.SlackBuild
+++ b/source/n/inetd/inetd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2017, 2018, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -59,6 +59,7 @@ tar xvf $CWD/inetd-OpenBSD-1.79.tar.gz || exit 1
 cd inetd
 zcat $CWD/inetd-OpenBSD-1.79.diff.gz | patch -p1 --backup --suffix=.orig --verbose -E
 zcat $CWD/inetd.loopingdos.diff.gz | patch -p1 --backup --suffix=.orig --verbose -E
+zcat $CWD/inetd.libtirpc.diff.gz | patch -p1 --backup --suffix=.orig --verbose -E
 
 # GCC 4 fix (thanks Fred Emmott)
 sed -i 's#(type)\([a-z]\)=(type)\([a-z]\)#\1=(type)\2#g' inetd.c
diff --git a/source/n/inetd/inetd.libtirpc.diff b/source/n/inetd/inetd.libtirpc.diff
new file mode 100644
index 000000000..fb006b266
--- /dev/null
+++ b/source/n/inetd/inetd.libtirpc.diff
@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2021-01-16 18:13:24.128176435 -0600
++++ ./Makefile	2021-01-16 18:17:03.714164289 -0600
+@@ -1,6 +1,6 @@
+ CC = gcc
+-CFLAGS = -O2
+-LDFLAGS = -s
++CFLAGS = -O2 -I/usr/include/tirpc
++LDFLAGS = -s -ltirpc
+ 
+ all:
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o inetd inetd.c
diff --git a/source/n/ncftp/ncftp.SlackBuild b/source/n/ncftp/ncftp.SlackBuild
index 6a64eb648..cde0f30de 100755
--- a/source/n/ncftp/ncftp.SlackBuild
+++ b/source/n/ncftp/ncftp.SlackBuild
@@ -47,13 +47,13 @@ fi
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fcommon"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
 fi
 
 TMP=${TMP:-/tmp}
diff --git a/source/n/netwatch/netwatch.SlackBuild b/source/n/netwatch/netwatch.SlackBuild
index 1ad703c48..d32092078 100755
--- a/source/n/netwatch/netwatch.SlackBuild
+++ b/source/n/netwatch/netwatch.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2016, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -48,13 +48,13 @@ fi
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fcommon"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fcommon"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
 fi
 
 TMP=${TMP:-/tmp}
diff --git a/source/n/nn/nn.SlackBuild b/source/n/nn/nn.SlackBuild
index d8783ddba..e894f5e01 100755
--- a/source/n/nn/nn.SlackBuild
+++ b/source/n/nn/nn.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2002-2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -45,15 +45,15 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
 fi
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
   LIBDIRSUFFIX=""
   MFILE="m-i80386.h"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fcommon"
   LIBDIRSUFFIX="64"
   MFILE="m-x86_64.h"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
   LIBDIRSUFFIX=""
   MFILE="m-i80386.h"
 fi
@@ -87,6 +87,8 @@ zcat $CWD/nn.badnntphost.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/nn.glibc-2.30.diff.gz | patch -p1 --verbose || exit 1
 
 cat config.h-dist | sed -e "s#m-sparc.h#${MFILE}#" > config.h
+# Apply CFLAGS:
+sed -i -e "s/-O2/$SLKCFLAGS/g" Makefile
 make all || exit 1
 
 # We'll pipe the correct options to ./inst
diff --git a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
index a68d18a1a..220686c69 100755
--- a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
+++ b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -72,6 +72,8 @@ find . \
 
 sh extract-and-patch.sh
 cd tcp_wrappers_$VERSION || exit 1
+# Fix for glibc-2.32:
+sed -i "s/-DHAVE_WEAKSYMS/-DHAVE_WEAKSYMS -DHAVE_STRERROR/g" Makefile
 make REAL_DAEMON_DIR=/usr/sbin linux || exit 1
 strip tcpd safe_finger tcpdchk tcpdmatch try-from
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
diff --git a/source/n/tftp-hpa/tftp-hpa.SlackBuild b/source/n/tftp-hpa/tftp-hpa.SlackBuild
index 86e362d00..fda5eb291 100755
--- a/source/n/tftp-hpa/tftp-hpa.SlackBuild
+++ b/source/n/tftp-hpa/tftp-hpa.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -64,6 +64,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Add -fcommon to CFLAGS:
+zcat $CWD/tftp-hpa.fcommon.diff.gz | patch -p1 --verbose || exit 1
+
 ./configure --prefix=/usr
 make $NUMJOBS || make || exit 1
 
diff --git a/source/n/tftp-hpa/tftp-hpa.fcommon.diff b/source/n/tftp-hpa/tftp-hpa.fcommon.diff
new file mode 100644
index 000000000..90250235a
--- /dev/null
+++ b/source/n/tftp-hpa/tftp-hpa.fcommon.diff
@@ -0,0 +1,11 @@
+--- ./MCONFIG.in.orig	2011-12-11 16:13:52.000000000 -0600
++++ ./MCONFIG.in	2021-01-16 12:55:22.406108324 -0600
+@@ -51,7 +51,7 @@
+ 
+ # Compiler and compiler flags
+ CC      = @CC@
+-CFLAGS  = @CFLAGS@ -I$(SRCROOT)
++CFLAGS  = @CFLAGS@ -I$(SRCROOT) -fcommon
+ 
+ # Link flags
+ LDFLAGS = @LDFLAGS@
diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild
index 41b19fc53..7865fe7f3 100755
--- a/source/n/vsftpd/vsftpd.SlackBuild
+++ b/source/n/vsftpd/vsftpd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2016, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -72,6 +72,8 @@ find . \
 zcat $CWD/vsftpd.builddefs.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/vsftpd.conf.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/vsftpd.crypt.diff.gz | patch -p1 --verbose || exit 1
+# patch from BLFS due to gcc >= 10.1.x
+sed -e "s/kVSFSysStrOpenUnknown;/(enum EVSFSysUtilOpenMode)&/" -i sysstr.c
 
 # Support OpenSSL 1.1.x:
 zcat $CWD/0021-Introduce-support-for-DHE-based-cipher-suites.patch.gz | patch -p1 --verbose || exit 1