From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 21 Aug 2018 08:56:14 +0000 (+0200)
Subject: Remove legacy support for SunOS
X-Git-Tag: v9.13.3~30^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b02de1ec30798371867e54707e7daca61c7dcd54;p=thirdparty%2Fbind9.git

Remove legacy support for SunOS
---

diff --git a/configure b/configure
index 29c9233fb98..efd70310fc5 100755
--- a/configure
+++ b/configure
@@ -2933,18 +2933,6 @@ $as_echo "no" >&6; }
 fi
 
 
-#
-# GNU libtool support
-#
-case $build_os in
-sunos*)
-    # Just set the maximum command line length for sunos as it otherwise
-    # takes a exceptionally long time to work it out. Required for libtool.
-
-    lt_cv_sys_max_cmd_len=4096;
-    ;;
-esac
-
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -19146,11 +19134,6 @@ done
 case "$host" in
 *-solaris*)
 
-$as_echo "#define NEED_SECURE_DIRECTORY 1" >>confdefs.h
-
-	;;
-*-sunos*)
-
 $as_echo "#define NEED_SECURE_DIRECTORY 1" >>confdefs.h
 
 	;;
@@ -20579,11 +20562,9 @@ fi
 
 #
 #  The following sets up how non-blocking i/o is established.
-#  Sunos, cygwin and solaris 2.x (x<5) require special handling.
+#  cygwin and solaris 2.x (x<5) require special handling.
 #
 case "$host" in
-*-sunos*) $as_echo "#define PORT_NONBLOCK O_NDELAY" >>confdefs.h
-;;
 *-cygwin*) $as_echo "#define PORT_NONBLOCK O_NDELAY" >>confdefs.h
 ;;
 *-solaris2.[01234])
@@ -22131,11 +22112,6 @@ else
 fi
 
 
-case $host in
-	*-sunos*) dlopen="no"
-		;;
-esac
-
 if test "yes" = "$dlopen"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
diff --git a/configure.in b/configure.in
index fa2125e3052..8da19404934 100644
--- a/configure.in
+++ b/configure.in
@@ -17,18 +17,6 @@ AC_CANONICAL_HOST
 
 AC_PROG_MAKE_SET
 
-#
-# GNU libtool support
-#
-case $build_os in
-sunos*)
-    # Just set the maximum command line length for sunos as it otherwise
-    # takes a exceptionally long time to work it out. Required for libtool.
-     
-    lt_cv_sys_max_cmd_len=4096;
-    ;;
-esac
-
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -2634,10 +2622,6 @@ case "$host" in
 	AC_DEFINE(NEED_SECURE_DIRECTORY, 1,
 		  [Define if connect does not honour the permission on the UNIX domain socket.])
 	;;
-*-sunos*)
-	AC_DEFINE(NEED_SECURE_DIRECTORY, 1,
-		  [Define if connect does not honour the permission on the UNIX domain socket.])
-	;;
 esac
 
 #
@@ -3225,10 +3209,9 @@ AC_SUBST(DNSTAP_PB_C_H)
 
 #
 #  The following sets up how non-blocking i/o is established.
-#  Sunos, cygwin and solaris 2.x (x<5) require special handling.
+#  cygwin and solaris 2.x (x<5) require special handling.
 #
 case "$host" in
-*-sunos*) AC_DEFINE(PORT_NONBLOCK, O_NDELAY);;
 *-cygwin*) AC_DEFINE(PORT_NONBLOCK, O_NDELAY);;
 *-solaris2.[[01234]])
 	AC_DEFINE(PORT_NONBLOCK, O_NONBLOCK)
@@ -3717,11 +3700,6 @@ AC_ARG_WITH(dlopen,
 			   [support dynamically loadable DLZ drivers]),
 	    dlopen="$withval", dlopen="yes")
 
-case $host in
-	*-sunos*) dlopen="no"
-		;;
-esac
-
 if test "yes" = "$dlopen"; then
 	AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
 	if test "yes" = "$have_dl"; then
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 3aff37fd85d..0e1b9d8dcd1 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -1196,8 +1196,8 @@ isc_socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm,
 /*%<
  * Set ownership and file permissions on the UNIX domain socket.
  *
- * Note: On Solaris and SunOS this secures the directory containing
- *       the socket as Solaris and SunOS do not honour the filesystem
+ * Note: On Solaris this secures the directory containing
+ *       the socket as Solaris do not honour the filesystem
  *	 permissions on the socket.
  *
  * Requires:
diff --git a/util/mksymtbl.pl b/util/mksymtbl.pl
index a7068f53255..a302fe27adb 100755
--- a/util/mksymtbl.pl
+++ b/util/mksymtbl.pl
@@ -37,7 +37,7 @@ if ($options{'o'}) {
 $nm_prog = "nm";
 $ostype = `uname -s`;
 chop($ostype);
-if ($ostype eq "SunOS" || $ostype eq "HP-UX") {
+if ($ostype eq "HP-UX") {
 	$nm_prog = "/usr/ccs/bin/nm -x"
 }
 
@@ -52,14 +52,7 @@ open(TBLFILE, ">$outputfile") || die "failed to open output file: $outputfile";
 $nsyms = 0;
 while (<SYMBOLS>) {
 	my ($addr, $symbol) = (0, "");
-	if ($ostype eq "SunOS") {
-		if (/\[\d*\]\s*\|\s*0x([0-9a-f]*)\|\s*0x[0-9a-f]*\|FUNC\s*(.*)\|([^|]+)$/) {
-			next if ($2 =~ /UNDEF/); # skip undefined symbols
-			$addr = $1;
-			$symbol = $3;
-			chop($symbol);
-		}
-	} elsif ($ostype eq "HP-UX") {
+	if ($ostype eq "HP-UX") {
 		if (/(\S*)\s*\|0x([0-9a-f]*)\|([^|]*\|entry|extern\|code)/) {
 			$addr = $2;
 			$symbol = $1;