From 90a99655a4d0feb3687b37d5a60082e1ade01c27 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 1 Apr 2021 23:50:48 +0000
Subject: Thu Apr  1 23:50:48 UTC 2021

a/aaa_glibc-solibs-2.33-x86_64-2.txz:  Rebuilt.
ap/inxi-20210329_a539c8fd-noarch-1.txz:  Upgraded.
l/glibc-2.33-x86_64-2.txz:  Rebuilt.
  Applied upstream patch to fix a performance regression:
  [PATCH] linux: Normalize and return timeout on select (BZ #27651)
  Thanks to Fulalas and Adhemerval Zanella.
l/glibc-i18n-2.33-x86_64-2.txz:  Rebuilt.
l/glibc-profile-2.33-x86_64-2.txz:  Rebuilt.
l/imagemagick-7.0.11_5-x86_64-1.txz:  Upgraded.
n/network-scripts-15.0-noarch-15.txz:  Rebuilt.
  netconfig: remove (broken) checks on hostname/domainname validity.
x/libXres-1.2.1-x86_64-1.txz:  Upgraded.
---
 .../n/network-scripts/network-scripts.SlackBuild   |  2 +-
 source/n/network-scripts/scripts/netconfig         | 30 +++-------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'source/n/network-scripts')

diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index 0093d246a..f3eaba9aa 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=network-scripts
 VERSION=${VERSION:-15.0}
 ARCH=noarch
-BUILD=${BUILD:-14}
+BUILD=${BUILD:-15}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
diff --git a/source/n/network-scripts/scripts/netconfig b/source/n/network-scripts/scripts/netconfig
index bb5a5acc2..f3e7445d6 100644
--- a/source/n/network-scripts/scripts/netconfig
+++ b/source/n/network-scripts/scripts/netconfig
@@ -461,17 +461,8 @@ EOF
   fi
   HOSTNM="`cat $TMP/SeThost`"
   rm -f $TMP/SeThost $TMP/tempmsg
-  if [ "$HOSTNM" = "" ] || [[ ! "$HOSTNM" =~ ^[[:alnum:]-]+$ ]] || \
-      [ "${HOSTNM:0:1}" == "-" ] || [ "${HOSTNM: -1:1}" == "-" ]; then
-    dialog --title "HOSTNAME" --ok-button "Back" --msgbox \
-        "That doesn't appear to be a valid hostname.\n
-Hostnames can only contain letters, numbers and hyphens,
-and may not begin or end with a hyphen." 7 60
-    if [ $? = 1 -o $? = 255 ]; then
-      exit
-    fi
-  else
-    break
+  if [ ! "$HOSTNM" = "" ]; then
+    break;
   fi
 done
 
@@ -491,21 +482,8 @@ EOF
   fi
   DOMAIN="`cat $TMP/SeTdom`"
   rm -f $TMP/SeTdom $TMP/tempmsg
-  # These regexes doon't catch everything, just basic syntax mistakes.
-  DN="${DOMAIN%.*}"
-  TLD="${DOMAIN##*.}"
-  if [ -z "$DOMAIN" ] || [ -z "$TLD" ] || [ -z "$DN" ] || [[ ! "$DOMAIN" =~ ^[^.-][[:alnum:].-]+[^.-]$ ]] || \
-      [[ ! "$DN" =~ ^[^.-][[:alnum:].-]+[^.-]$ ]] || [[ "$DN" =~ \.\. ]] || [[ "$DN" =~ -- ]] || \
-      [[ ! "$TLD" =~ ^[^-][[:alnum:]-]+[^-]$ ]]; then
-    dialog --title "DOMAINNAME" --ok-button "Back" --msgbox \
-      "That doesn't appear to be a valid domain name.\n
-Domain names can only contain letters and numbers, hyphens
-and dots, and may not begin or end with a hyphen or dot." 7 68
-    if [ $? = 1 -o $? = 255 ]; then
-      exit
-    fi
-  else
-    break
+  if [ ! "$DOMAIN" = "" ]; then
+    break;
   fi
 done
 
-- 
cgit v1.2.3