Remove SGI IRIX support (#2404)

SGI IRIX was last released in 2006, and
support discontinued in 2013.

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 14ed0e493f6085973e9aa322f1dcf7969ce8c895..dd77caa313475dc11172bfc4b7ad2c56ffd77da0 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -60,7 +60,6 @@ libcompatsquid_la_SOURCES = \
        os/openbsd.h \
        os/os2.h \
        os/qnx.h \
        os/openbsd.h \
        os/os2.h \
        os/qnx.h \

-       os/sgi.h \

        os/solaris.h \
        os/sunos.h \
        osdetect.h \
        os/solaris.h \
        os/sunos.h \
        osdetect.h \

diff --git a/compat/compat.h b/compat/compat.h
index 7b1fd5e7ffd441f32e0f0d1f43304e550acd2b93..eb398fcc7e8e83a9c7d69682e3160f2d30741ea4 100644 (file)
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -74,7 +74,6 @@
 #include "compat/os/openbsd.h"
 #include "compat/os/os2.h"
 #include "compat/os/qnx.h"
 #include "compat/os/openbsd.h"
 #include "compat/os/os2.h"
 #include "compat/os/qnx.h"

-#include "compat/os/sgi.h"

 #include "compat/os/solaris.h"
 #include "compat/os/sunos.h"
 
 #include "compat/os/solaris.h"
 #include "compat/os/sunos.h"
 

diff --git a/compat/fdsetsize.h b/compat/fdsetsize.h
index afb50bcf3f32473092adbffd8426e2b28c5b5727..ac752bd3059a037ed508331a07d6371f95256596 100644 (file)
--- a/compat/fdsetsize.h
+++ b/compat/fdsetsize.h
@@ -17,9 +17,9 @@
 
 /*
  * On some systems, FD_SETSIZE is set to something lower than the
 
 /*
  * On some systems, FD_SETSIZE is set to something lower than the

- * actual number of files which can be opened.  IRIX is one case,
- * NetBSD is another.  So here we increase FD_SETSIZE to our
- * configure-discovered maximum *before* any system includes.
+ * actual number of files which can be opened. NetBSD is one
+ * case. So here we increase FD_SETSIZE to our configure-discovered
+ * maximum *before* any system includes.

  */
 #define CHANGE_FD_SETSIZE 1
 
  */
 #define CHANGE_FD_SETSIZE 1
 

diff --git a/compat/os/sgi.h b/compat/os/sgi.h
deleted file mode 100644 (file)
index db5e34f..0000000
--- a/compat/os/sgi.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 1996-2026 The Squid Software Foundation and contributors
- *
- * Squid software is distributed under GPLv2+ license and includes
- * contributions from numerous individuals and organizations.
- * Please see the COPYING and CONTRIBUTORS files for details.
- */
-
-#ifndef SQUID_COMPAT_OS_SGI_H
-#define SQUID_COMPAT_OS_SGI_H
-
-#if _SQUID_SGI_
-
-/****************************************************************************
- *--------------------------------------------------------------------------*
- * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...*
- *--------------------------------------------------------------------------*
- ****************************************************************************/
-
-#if !defined(_SVR4_SOURCE)
-#define _SVR4_SOURCE        /* for tempnam(3) */
-#endif
-
-#if USE_ASYNC_IO
-#define _ABI_SOURCE
-#endif /* USE_ASYNC_IO */
-
-#endif /* _SQUID_SGI_ */
-#endif /* SQUID_COMPAT_OS_SGI_H */
-

diff --git a/compat/osdetect.h b/compat/osdetect.h
index d3fc0782a5e394352bf9d8f1628ef1930bd82fd5..0724ef8e590d97bfc74454934a16a62f1672c792 100644 (file)
--- a/compat/osdetect.h
+++ b/compat/osdetect.h
@@ -49,9 +49,6 @@
 #elif defined(__FreeBSD_kernel__)      /* GNU/kFreeBSD */
 #define _SQUID_KFREEBSD_ 1
 
 #elif defined(__FreeBSD_kernel__)      /* GNU/kFreeBSD */
 #define _SQUID_KFREEBSD_ 1
 

-#elif defined(__sgi__)  || defined(sgi) || defined(__sgi)   /* SGI */
-#define _SQUID_SGI_ 1
-

 #elif defined(__NetBSD__)
 #define _SQUID_NETBSD_ 1
 
 #elif defined(__NetBSD__)
 #define _SQUID_NETBSD_ 1
 

diff --git a/configure.ac b/configure.ac
index 90c036e0df851d03e376d546652473813da80a34..6b4cac554f597e5ac5ffa13dc55a00e2eb3b152f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -292,19 +292,6 @@ AS_IF([test "x$PRESET_CFLAGS" = "x"],[
       ],
       [CFLAGS="$squid_cv_cc_option_wall $CFLAGS"]
     )
       ],
       [CFLAGS="$squid_cv_cc_option_wall $CFLAGS"]
     )

-  ],[
-    AS_CASE(["$host"],
-      [*mips-sgi-irix6.*],[
-        # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
-        CFLAGS="$squid_cv_cc_option_optimize -OPT:Olimit=0:space=OFF \
-                -woff 1009,1014,1110,1116,1183,1185,1188,1204,1230,1233,1355 \
-                -Wl,-woff,85,-woff,84,-woff,134 \
-                -nostdinc -I/usr/include -D_BSD_SIGNALS $CFLAGS"
-        CXXFLAGS="$squid_cv_cc_option_optimize -OPT:Olimit=0:space=OFF \
-                  -woff 1009,1014,1110,1116,1183,1185,1188,1204,1230,1233,1355 \
-                  -Wl,-woff,85,-woff,84,-woff,134 \
-                  -nostdinc -I/usr/include -D_BSD_SIGNALS $CXXFLAGS"
-    ])

   ])
 ])
 
   ])
 ])
 


@@ -2067,14 +2054,6 @@ AS_CASE(["$host"],
     ])
   ],
 
     ])
   ],
 

-  [*-sgi-irix*],[
-    AC_MSG_NOTICE([Removing -lsocket for IRIX...])
-    LIBS=`echo $LIBS | sed -e s/-lsocket//`
-    AC_MSG_NOTICE([Removing -lnsl for IRIX...])
-    LIBS=`echo $LIBS | sed -e s/-lnsl//`
-    ac_cv_lib_nsl_main=no
-  ],
-

   [*-ibm-aix*],[
     SQUID_CC_REQUIRE_ARGUMENT([ac_cv_require_rtti],[-rtti],[[
 #include <assert.h>
   [*-ibm-aix*],[
     SQUID_CC_REQUIRE_ARGUMENT([ac_cv_require_rtti],[-rtti],[[
 #include <assert.h>

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 2c0bafcbf74c208b1ad1b204991c830d107653c7..25c02085e4c976e20ee357c66d17a87a3f5c5d1d 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -38,15 +38,6 @@ install-solaris2.4 install-solaris2.5:
        @echo "set SQUID=0 in /etc/init.d/squid to disable squid at startup"
        @echo "edit /etc/init.d/squid to change options"
 
        @echo "set SQUID=0 in /etc/init.d/squid to disable squid at startup"
        @echo "edit /etc/init.d/squid to change options"
 

-install-irix6.2:
-       $(INSTALL_BIN) $(SQUID_RC) /etc/init.d/squid
-       $(INSTALL_FILE) $(SQUID_OPTIONS) /var/config/squid.options
-       -$(LN_S) ../init.d/squid /etc/rc2.d/S99squid
-       -$(LN_S) ../init.d/squid /etc/rc0.d/K01squid
-       /sbin/chkconfig -f squid on
-       @echo "use 'chkconfig squid off' to disable squid at startup"
-       @echo "edit /var/config/squid.options to change options"
-

 install-osf3.2:
        $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid
        -$(LN_S) ../init.d/squid /sbin/rc2.d/S99squid
 install-osf3.2:
        $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid
        -$(LN_S) ../init.d/squid /sbin/rc2.d/S99squid

diff --git a/scripts/icpserver.pl b/scripts/icpserver.pl
index f2940288348381c62e64f10b1b40d966f134b539..1ad9a95ef4e8d21e6539266d3d763557fb680268 100755 (executable)
--- a/scripts/icpserver.pl
+++ b/scripts/icpserver.pl
@@ -48,7 +48,6 @@ if ($SERVER ne "0.0.0.0") { # i.e. multicast
     $whoami = (`uname -a`)[0];
     $IP_ADD_MEMBERSHIP=5;
     $whoami =~ /SunOS [^\s]+ 5/ && ($IP_MULTICAST_TTL=19);
     $whoami = (`uname -a`)[0];
     $IP_ADD_MEMBERSHIP=5;
     $whoami =~ /SunOS [^\s]+ 5/ && ($IP_MULTICAST_TTL=19);

-    $whoami =~ /IRIX [^\s]+ 5/ && ($IP_MULTICAST_TTL=23);

     $whoami =~ /OSF1/ && ($IP_MULTICAST_TTL=12);
     # any more funnies ?
 
     $whoami =~ /OSF1/ && ($IP_MULTICAST_TTL=12);
     # any more funnies ?
 

diff --git a/src/time/rfc1123.cc b/src/time/rfc1123.cc
index 9b8b0762b9041b305be75cefe1e85224f9620fa9..f9ba10b2d5299de424dd142feefeb8c821922c7d 100644 (file)
--- a/src/time/rfc1123.cc
+++ b/src/time/rfc1123.cc
@@ -179,7 +179,7 @@ Time::ParseRfc1123(const char *str)
     t = mktime(tm);
     if (t != -1) {
         time_t dst = 0;
     t = mktime(tm);
     if (t != -1) {
         time_t dst = 0;

-#if !(defined(_TIMEZONE) || defined(_timezone) || _SQUID_AIX_ || _SQUID_WINDOWS_ || _SQUID_SGI_)
+#if !(defined(_TIMEZONE) || defined(_timezone) || _SQUID_AIX_ || _SQUID_WINDOWS_)

         extern long timezone;
 #endif
         /*
         extern long timezone;
 #endif
         /*

diff --git a/src/tools.cc b/src/tools.cc
index a828805581fe97192de824f15ae92f695bdbfb23..540dc0a80db7390d554ebcdbdf924261da6e63b0 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -253,10 +253,7 @@ int
 
 rusage_maxrss(struct rusage *r)
 {
 
 rusage_maxrss(struct rusage *r)
 {

-#if _SQUID_SGI_ && _ABIAPI
-    return r->ru_pad[0];
-#elif _SQUID_SGI_|| _SQUID_OSF_ || _SQUID_AIX_ || defined(BSD4_4)
-
+#if _SQUID_OSF_ || _SQUID_AIX_ || defined(BSD4_4)

     return r->ru_maxrss;
 #elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
 
     return r->ru_maxrss;
 #elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
 


@@ -274,12 +271,7 @@ int
 
 rusage_pagefaults(struct rusage *r)
 {
 
 rusage_pagefaults(struct rusage *r)
 {

-#if _SQUID_SGI_ && _ABIAPI
-    return r->ru_pad[5];
-#else
-

     return r->ru_majflt;
     return r->ru_majflt;

-#endif

 }
 
 /// Make the process traceable if possible. Call setTraceability() instead!
 }
 
 /// Make the process traceable if possible. Call setTraceability() instead!

diff --git a/tools/sysvinit/squid.rc b/tools/sysvinit/squid.rc
index 0c2ac083e4a5232725f0fc7c8e5ce565cf272dd2..5466df8404c759ca1d581196453640418dc75637 100644 (file)
--- a/tools/sysvinit/squid.rc
+++ b/tools/sysvinit/squid.rc
@@ -18,18 +18,8 @@ export PATH
 
 config()
 {
 
 config()
 {

-    # SGI IRIX 6.2
-    if [ -f /sbin/chkconfig ]
-    then if /sbin/chkconfig squid
-        then if [ -f /var/config/squid.options ]
-             then . /var/config/squid.options
-             fi
-             SQUID=1
-        else SQUID=0
-        fi
-

     # Digital UNIX
     # Digital UNIX

-    elif [ -f /usr/sbin/rcmgr ]
+    if [ -f /usr/sbin/rcmgr ]

     then SQUID=`/usr/sbin/rcmgr get SQUID 0`
         SQUID_OPTIONS=`/usr/sbin/rcmgr get SQUID_OPTIONS "-s"`
         SQUID_RESPAWN=`/usr/sbin/rcmgr get SQUID_RESPAWN 1`
     then SQUID=`/usr/sbin/rcmgr get SQUID 0`
         SQUID_OPTIONS=`/usr/sbin/rcmgr get SQUID_OPTIONS "-s"`
         SQUID_RESPAWN=`/usr/sbin/rcmgr get SQUID_RESPAWN 1`