]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Remove NeXTSTEP support (#943)
authorAmos Jeffries <yadij@users.noreply.github.com>
Sat, 4 Dec 2021 21:57:01 +0000 (21:57 +0000)
committerSquid Anubis <squid-anubis@squid-cache.org>
Sun, 5 Dec 2021 17:31:15 +0000 (17:31 +0000)
NeXT architecture hardware is no longer available and with that
hardware any support by Apple ceased.

QNX and MacOS descendant systems which still depend on some of
the workarounds already are or can be supported under their own
compatibility section.

16 files changed:
compat/Makefile.am
compat/compat.h
compat/os/next.h [deleted file]
compat/osdetect.h
configure.ac
contrib/Makefile.am
contrib/nextstep/Makefile [deleted file]
contrib/nextstep/Makefile.real [deleted file]
contrib/nextstep/README [deleted file]
contrib/nextstep/Squid.pkg.README [deleted file]
contrib/nextstep/info.in [deleted file]
contrib/nextstep/makepkg [deleted file]
contrib/nextstep/post_install [deleted file]
contrib/nextstep/pre_install [deleted file]
src/tools.cc
src/tools.h

index b783f7656a7d67614cad66bd920bdb656bbe69b9..eb0c53960bfde4492dbe2d3275ed7c0953a18724 100644 (file)
@@ -53,7 +53,6 @@ libcompatsquid_la_SOURCES = \
        os/macosx.h \
        os/mswindows.h \
        os/netbsd.h \
-       os/next.h \
        os/openbsd.h \
        os/opensolaris_10_netdb.h \
        os/os2.h \
index c0f577e0c42cf721195c82f9c31a1857c07097d6..59cbe7a3b8c1fde00e24f509492513f08b32277f 100644 (file)
@@ -70,7 +70,6 @@
 #include "compat/os/macosx.h"
 #include "compat/os/mswindows.h"
 #include "compat/os/netbsd.h"
-#include "compat/os/next.h"
 #include "compat/os/openbsd.h"
 #include "compat/os/os2.h"
 #include "compat/os/qnx.h"
diff --git a/compat/os/next.h b/compat/os/next.h
deleted file mode 100644 (file)
index d5595c5..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 1996-2021 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_OS_NEXT_H
-#define SQUID_OS_NEXT_H
-
-#if _SQUID_NEXT_
-
-/****************************************************************************
- *--------------------------------------------------------------------------*
- * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...*
- *--------------------------------------------------------------------------*
- ****************************************************************************/
-
-/*
- * Don't allow inclusion of malloc.h
- */
-#if defined(HAVE_MALLOC_H)
-#undef HAVE_MALLOC_H
-#endif
-
-/*
- * S_ISDIR() may not be defined on Next
- */
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if !defined(S_ISDIR)
-#define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
-#endif
-
-/*
- * WAS: lots of special wrappers labeled only 'protect NEXTSTEP'
- * I'm assuming its an incomplete definition problem on that OS
- * or a missing safety wrapper by the looks of the original hack.
- *
- * Anyway, this file is included before all general non-type headers.
- * doing the include here for Next and undefining HAVE_NETDB_H will
- * save us from including it again in general.
- */
-#if HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#undef HAVE_NETDB_H
-#define HAVE_NETDB_H 0
-
-#if !defined(S_ISDIR)
-#define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
-#endif
-
-#endif /* _SQUID_NEXT_ */
-#endif /* SQUID_OS_NEXT_H */
-
index 08ccfe6e49681c35085975a81868bbb896c474fe..17f8aa9675a877a10eb2ad6db152c3a5bf8710d7 100644 (file)
@@ -52,9 +52,6 @@
 #elif defined(__sgi__)  || defined(sgi) || defined(__sgi)   /* SGI */
 #define _SQUID_SGI_ 1
 
-#elif defined(__NeXT__)
-#define _SQUID_NEXT_ 1
-
 #elif defined(__NetBSD__)
 #define _SQUID_NETBSD_ 1
 
index a2f279a7f8b245ac1ad864faa9dce38b18b6c901..481de4ca36d7afa882c5a8967583d04a706b79a2 100644 (file)
@@ -3495,15 +3495,12 @@ AC_ARG_ENABLE(gnuregex,
                  library built in.]), [
 SQUID_YESNO([$enableval],[unrecognized argument to --enable-gnuregex: $enableval])
 ])
-# force-enable on old solaris and nextstep
+# force-enable on old solaris
 if test "x${enable_gnuregex:=auto}" = "xauto" ; then
     case "$host" in
     *-sun-solaris2.[[0-4]])
          enable_gnuregex="yes"
          ;;
-    *-next-nextstep*)
-         enable_gnuregex="yes"
-         ;;
     esac
 fi
 
index cd037ddcaf9d2b40f04e73d80138fa63dcbfa7fa..d8848d46ca267368c4f4c56e35e000837c142054 100644 (file)
@@ -18,14 +18,6 @@ EXTRA_DIST = \
        config.site \
        user-agents.pl \
        url-normalizer.pl \
-       nextstep/Makefile \
-       nextstep/Makefile.real \
-       nextstep/README \
-       nextstep/Squid.pkg.README \
-       nextstep/info.in \
-       nextstep/makepkg \
-       nextstep/post_install \
-       nextstep/pre_install \
        solaris/solaris-krb5-include.patch
 
 all: 
diff --git a/contrib/nextstep/Makefile b/contrib/nextstep/Makefile
deleted file mode 100644 (file)
index cad56b4..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-VERSION=`pwd | sed 's"/contrib/nextstep""' | sed 's/.*-//'`
-ARCHS=`grep 's%@host_cpu@%' ../../config.status | sed "s/s%@host_cpu@%\([nihs]*\)%g/\1/g" | tr a-z A-Z`
-
-pkg:
-       ${MAKE} -f Makefile.real ARCHS=${ARCHS} VERSION=${VERSION} pkg
-
-tar:
-       ${MAKE} -f Makefile.real ARCHS=${ARCHS} VERSION=${VERSION} tar
-
-clean:
-       ${MAKE} -f Makefile.real ARCHS=${ARCHS} VERSION=${VERSION} clean
-
-echo:
-       ${MAKE} -f Makefile.real ARCHS=${ARCHS} VERSION=${VERSION} echo
diff --git a/contrib/nextstep/Makefile.real b/contrib/nextstep/Makefile.real
deleted file mode 100644 (file)
index e9f1dfb..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-.SUFFIXES: .pkg .tar .info
-
-PRG=Squid
-TIMESTAMP=.pkg_made
-PKGNAME=${PRG}.pkg
-TARNAME=${PRG}-${VERSION}.${ARCHS}.tar.gz
-
-${TIMESTAMP}: /usr/local/squid/sbin/squid Squid.pkg.README info.in post_install \
-       pre_install makepkg Makefile.real
-       ./makepkg
-       touch ${TIMESTAMP}
-
-${TARNAME}: ${TIMESTAMP}
-       gnutar zcvf ${TARNAME} ${PKGNAME} ${PRG}-${VERSION}.README
-
-tar: ${TARNAME}
-
-pkg: ${TIMESTAMP}
-
-clean:
-       rm -rf ${PKGNAME} ${TARNAME} ${PRG}-${VERSION}.README ${TIMESTAMP}
-
-echo:
-       echo ${PKGNAME}
diff --git a/contrib/nextstep/README b/contrib/nextstep/README
deleted file mode 100644 (file)
index 1559271..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-First run 'make install' from directory ../.. Make sure you compile fat.
-
-
-Then run './makepkg' from this directory. This uses the just installed fat
-binaries in a package. And creates a help file.
-
-Or better: after running make install in ../.. run make tar in this directory.
diff --git a/contrib/nextstep/Squid.pkg.README b/contrib/nextstep/Squid.pkg.README
deleted file mode 100644 (file)
index a6df6fc..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-This installer package contains the Squid internet cache for OPENSTEP. It has
-been compiled for m68k and i486.
-
-The following has not been checked for Squid 2:
-
-Currently, the Run* scripts in /usr/local/squid/bin do not work because they
-assume a non-standard date program. If you want them to work, compile and
-install the following program as /usr/local/squid/bin/epoch:
-
-#include <stdio.h>
-
-main()
-{
-    long t = time();
-    printf( "%ul\n", t);
-}
-
-And change the "date '+%d%H%M%S'" invocations in the Run* scripts to
-/usr/local/squid/bin/epoch
-
-Gerben Wierda
diff --git a/contrib/nextstep/info.in b/contrib/nextstep/info.in
deleted file mode 100644 (file)
index eab4134..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Title          Squid - Internet Object cache
-Version                --VERSION-- (--DATE--)
-Description    This package contains all executables, support files and documentation  necessary to run Squid. NOTE: this package should be installed as "root".
-DefaultLocation        /
-Relocatable    NO
-DisableStop    YES
-DiskName       Squid
diff --git a/contrib/nextstep/makepkg b/contrib/nextstep/makepkg
deleted file mode 100644 (file)
index a5cc3f5..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# /bin/cp because GNU cp is installed sometimes and has different syntax
-# This file has been changed for Squid 2
-
-failed()
-{
-       # show failed message and exit
-       echo "FAILED ($*)"
-       exit 1
-}
-
-#      check if caller runs as super user:
-[ `/usr/ucb/whoami` = root ] || failed "must be super user"
-
-PRG=Squid
-SRCDIR=`cd ../..;pwd`
-REL=`basename $SRCDIR | sed 's/.*-//'`
-
-# Make info file from info.in:
-cat info.in | sed "s/--VERSION--/$REL/" | sed "s/--DATE--/`date`/" >info
-
-TMPDIR=/tmp/${PRG}
-# Cleanup previous package creation
-rm -rf ${TMPDIR}
-rm -rf ${PRG}.pkg
-
-# Create pre- and post-install scripts for the package, make sure these
-# are executable
-for f in post_install pre_install
-do
-       /bin/cp -p ${f} ${PRG}.${f}
-       chmod 755 ${PRG}.${f}
-done
-/bin/cp -p info ${PRG}.info
-chmod 644 ${PRG}.info
-
-mkdirs ${TMPDIR}/usr/local/squid/etc ${TMPDIR}/usr/local/squid/logs
-/bin/cp -pr /usr/local/squid/bin ${TMPDIR}/usr/local/squid
-/bin/cp -pr /usr/local/squid/etc/squid.conf.default ${TMPDIR}/usr/local/squid/etc
-# SQUID 2 (comment out if Squid 1)
-/bin/cp -pr /usr/local/squid/etc/mime.conf.default ${TMPDIR}/usr/local/squid/etc
-/bin/cp -pr /usr/local/squid/etc/icons ${TMPDIR}/usr/local/squid/etc
-/bin/cp -pr /usr/local/squid/etc/errors ${TMPDIR}/usr/local/squid/etc
-# END SQUID 2
-strip ${TMPDIR}/usr/local/squid/bin/*
-# It turns out that the Run* scripts are sometimes not executable
-chmod 755 ${TMPDIR}/usr/local/squid/bin/*
-/etc/chown -R nobody.other ${TMPDIR}/usr/local/squid
-
-/NextAdmin/Installer.app/package /tmp/${PRG} ${PRG}.info
-/bin/cp ${PRG}.pre_install ${PRG}.pkg
-/bin/cp ${PRG}.post_install ${PRG}.pkg
-/bin/cp -p Squid.pkg.README ${PRG}-${REL}.README
-
-# Cleanup:
-for f in post_install pre_install info
-do
-       rm ${PRG}.${f}
-done
-rm info
diff --git a/contrib/nextstep/post_install b/contrib/nextstep/post_install
deleted file mode 100644 (file)
index f0aab85..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-PATH=
-
-PKG="$1"
-DST="$2"
-
-PKGNAME=`/usr/bin/basename $1`
-
-USAGE="Usage: $PKGNAME.post_install package_path [install_path]"
-
-trap 'echo "FAILED (interrupted by signal)"; exit 1' 1 2 3 4 15
-
-BEGINDATE=`/bin/date`
-#FDATE=`echo $BEGINDATE | /bin/awk '{print $2 "_" $3 "_" $7 "_" $4}'`
-echo $PKGNAME post-installation script starts at $BEGINDATE
-
-failed()
-{
-       # show failed message and exit
-       echo "FAILED ($*)"
-       exit 1
-}
-
-echo
-
-echo "Removing the Installer remains of possible other Squid installations... "
-cd /NextLibrary/Receipts
-/bin/rm -rf Squid-*.pkg
-
-/etc/chown -R nobody.other /usr/local/squid || failed "can't chown $1!"
-/etc/chown root.wheel /usr/local/squid/bin/pinger  || failed "can't chown $1!"
-/bin/chmod 4755 /usr/local/squid/bin/pinger  || failed "can't chmod $1!"
-
-if [ -e/usr/local/squid/etc/mime.conf ]
-then
-       echo "Already have mime.conf"
-else
-       echo "Installing default mime.conf"
-       (cd /usr/local/squid/etc; /bin/cp -p mime.conf.default mime.conf)
-fi
-
-echo "(done)"
diff --git a/contrib/nextstep/pre_install b/contrib/nextstep/pre_install
deleted file mode 100644 (file)
index 1b898e6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-PATH=
-
-PKG="$1"
-DST="$2"
-
-PKGNAME=`/usr/bin/basename $1`
-
-USAGE="Usage: $PKGNAME.pre_install package_path [install_path]"
-
-trap 'echo "FAILED (interrupted by signal)"; exit 1' 1 2 3 4 15
-
-BEGINDATE=`/bin/date`
-#FDATE=`echo $BEGINDATE | /bin/awk '{print $2 "_" $3 "_" $7 "_" $4}'`
-echo
-echo $PKGNAME pre-installation script starts at $BEGINDATE
-
-failed()
-{
-       # show failed message and exit
-       echo "FAILED ($*)"
-       exit 1
-}
-
-echo
-
-#      check if caller runs as super user:
-[ `/usr/ucb/whoami` = root ] || failed "must be super user"
index bcdea420e3db7d8dcafe6fef88a1cd0301b6049a..27f7e26a892e5afa3cecb817d1a1730fc452918c 100644 (file)
@@ -1146,11 +1146,7 @@ restoreCapabilities(bool keep)
 pid_t
 WaitForOnePid(pid_t pid, PidStatus &status, int flags)
 {
-#if _SQUID_NEXT_
-    if (pid < 0)
-        return wait3(&status, flags, NULL);
-    return wait4(pid, &status, flags, NULL);
-#elif _SQUID_WINDOWS_
+#if _SQUID_WINDOWS_
     return 0; // function not used on Windows
 #else
     return waitpid(pid, &status, flags);
index 64029dd8bb32a5c3b40f5c426ca46385278c9925..0414d7166496cff1410efec3b9a17a1a03338499 100644 (file)
@@ -88,11 +88,7 @@ void releaseServerSockets(void);
 void PrintRusage(void);
 void dumpMallocStats(void);
 
-#if _SQUID_NEXT_
-typedef union wait PidStatus;
-#else
 typedef int PidStatus;
-#endif
 
 /**
  * Compatibility wrapper function for waitpid