Merge branch 'CDRIVER-2230-end-solaris'

* CDRIVER-2230-end-solaris:
  CDRIVER-2230 End Official Solaris Support

Author: bjori

.evergreen/compile-unix.sh

@@ -85,7 +85,7 @@ CONFIGURE_SCRIPT="./autogen.sh"
 
 
 # --strip-components is an GNU tar extension. Check if the platform
-# (e.g. Solaris) has GNU tar installed as `gtar`, otherwise we assume to be on
+# has GNU tar installed as `gtar`, otherwise we assume to be on
 # platform that supports it
 # command -v returns success error code if found and prints the path to it
 if command -v gtar 2>/dev/null; then
@@ -161,15 +161,6 @@ case "$OS" in
       MAKEFLAGS="-j${cpus}"
       export LD_LIBRARY_PATH=".libs:src/libbson/.libs:$LD_LIBRARY_PATH"
    ;;
-
-   sunos)
-      PATH="/opt/mongodbtoolchain/bin:$PATH"
-      if [  "$SASL" != "no" ]; then
-         export SASL_CFLAGS="-I/opt/csw/include/"
-         export SASL_LIBS="-L/opt/csw/lib/amd64/ -lsasl2"
-      fi
-      export LD_LIBRARY_PATH="/opt/csw/lib/amd64/:.libs:src/libbson/.libs:$LD_LIBRARY_PATH"
-   ;;
 esac
 
 case "$CC" in

.evergreen/config.yml

@@ -334,7 +334,6 @@ functions:
         working_dir: "mongoc"
         script: |
               sudo apt-get install -y awscli || true
-              sudo /opt/csw/bin/pkgutil -y -i sasl_dev sasl_gssapi || true
 
   "prepare kerberos" :
     - command: shell.exec
@@ -6849,45 +6848,6 @@ buildvariants:
     - ".3.4 .nossl !.nosasl"
       # Ubuntu16.04 only supports MongoDB 3.4+
 
-# Interesting platforms
-#- name: solaris
-#  display_name: "*Solaris (x86-64) (GCC 4.9.2)"
-#  expansions:
-#    CC: "gcc"
-#    MARCH: "x86_64"
-#  batchtime: 1440 # 1 day
-#  run_on:
-#    - solaris
-#  tasks:
-#    - "release-compile"
-#    - "debug-compile"
-#    - "debug-compile-nosasl-openssl"
-#    - ".debug-compile !.sspi .nossl"
-#    - ".authentication-tests .nosasl !.ssl !.sspi" # Revert me: CDRIVER-2000
-#    - ".authentication-tests .openssl"
-#    - ".latest .nossl" # No MongoDB SSL builds available for any version
-#    - ".3.4 .nossl" # No MongoDB SSL builds available for any version
-#    - ".3.2 .nossl !.nosasl"
-#    - ".3.0 .nossl !.nosasl"
-#    - ".2.6 .nossl !.nosasl"
-#
-#- name: solaris-32
-#  display_name: "Solaris (i386) (GCC 4.9.2)"
-#  expansions:
-#    CC: "gcc"
-#    MARCH: "i386"
-#  batchtime: 1440 # 1 day
-#  run_on:
-#    - solaris
-#  tasks:
-#    - "release-compile"
-#    - "debug-compile"
-#    - ".debug-compile !.sspi .nossl .nosasl"
-#    - ".authentication-tests .nosasl !.ssl"
-#    - ".latest .nossl .nosasl"
-#    - ".3.4 .nossl .nosasl"
-#      # We don't have i386 builds of OpenSSL or Cyrus SASL installed
-
 - name: darwin
   display_name: "*Darwin, macOS (Apple LLVM)"
   expansions:

.evergreen/download-mongodb.sh

@@ -62,14 +62,6 @@ get_mongodb_download_url_for ()
              MONGODB_26="https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-${VERSION_26}.tgz"
              MONGODB_24="https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-${VERSION_24}.tgz"
       ;;
-      sunos*i86pc)
-         MONGODB_LATEST="https://fastdl.mongodb.org/sunos5/mongodb-sunos5-x86_64-latest.tgz"
-             MONGODB_34="https://fastdl.mongodb.org/sunos5/mongodb-sunos5-x86_64-${VERSION_34}.tgz"
-             MONGODB_32="https://fastdl.mongodb.org/sunos5/mongodb-sunos5-x86_64-${VERSION_32}.tgz"
-             MONGODB_30="https://fastdl.mongodb.org/sunos5/mongodb-sunos5-x86_64-${VERSION_30}.tgz"
-             MONGODB_26="https://fastdl.mongodb.org/sunos5/mongodb-sunos5-x86_64-${VERSION_26}.tgz"
-             MONGODB_24="https://fastdl.mongodb.org/sunos5/mongodb-sunos5-x86_64-${VERSION_24}.tgz"
-      ;;
       linux-rhel-7.2-s390x)
          MONGODB_LATEST="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-latest.tgz"
              MONGODB_34="http://downloads.10gen.com/linux/mongodb-linux-s390x-enterprise-rhel72-${VERSION_34}.tgz"

.evergreen/integration-tests.sh

@@ -76,14 +76,6 @@ case "$OS" in
          export MONGO_SHELL_CONNECTION_FLAGS="$MONGO_SHELL_CONNECTION_FLAGS --host localhost --ssl --sslCAFile=$MONGO_ORCHESTRATION_HOME/lib/ca.pem --sslPEMKeyFile=$MONGO_ORCHESTRATION_HOME/lib/client.pem"
       fi
       ;;
-   sunos*)
-      # Can't make a virtual env here
-      echo "{ \"releases\": { \"default\": \"`pwd`/mongodb/bin\" } }" > orchestration.config
-      nohup mongo-orchestration -f orchestration.config -e default --socket-timeout-ms=60000 --bind=127.0.0.1  --enable-majority-read-concern start > $MONGO_ORCHESTRATION_HOME/out.log 2> $MONGO_ORCHESTRATION_HOME/err.log < /dev/null &
-      if [ "$SSL" != "nossl" ]; then
-         export MONGO_SHELL_CONNECTION_FLAGS="$MONGO_SHELL_CONNECTION_FLAGS --host localhost --ssl --sslCAFile=$MONGO_ORCHESTRATION_HOME/lib/ca.pem --sslPEMKeyFile=$MONGO_ORCHESTRATION_HOME/lib/client.pem"
-      fi
-      ;;
    *)
       echo "{ \"releases\": { \"default\": \"`pwd`/mongodb/bin\" } }" > orchestration.config
       # Make sure MO is running latest version

.evergreen/run-auth-tests.sh

@@ -39,12 +39,6 @@ case "$OS" in
       PING="./mongoc-ping"
       ;;
 
-   sunos)
-      PATH="/opt/mongodbtoolchain/bin:$PATH"
-      export LD_LIBRARY_PATH="install-dir/lib:/opt/csw/lib/amd64/:.libs:src/libbson/.libs"
-      PING="./mongoc-ping"
-      ;;
-
    *)
       # This libtool wrapper script was built in a unique dir like
       # "/data/mci/998e754a0d1ed79b8bf733f405b87778/mongoc",
@@ -65,9 +59,6 @@ fi
 cp /etc/ca-certificates/extracted/tls-ca-bundle.pem install-dir/ssl/cert.pem || true
 # OpenSSL fips enabled path
 cp /etc/ca-certificates/extracted/tls-ca-bundle.pem install-dir/cert.pem || true
-# Solaris CSW OpenSSL install need to copy the OS trust store
-sudo mkdir -p /etc/opt/csw/ssl/ || true
-sudo cp /etc/ssl/cert.pem /etc/opt/csw/ssl/ || true
 
 export PATH=install-dir/bin:$PATH
 openssl version || true

.evergreen/run-tests.sh

@@ -59,11 +59,6 @@ case "$OS" in
       export DYLD_LIBRARY_PATH=".libs:src/libbson/.libs"
       ;;
 
-   sunos)
-      PATH="/opt/mongodbtoolchain/bin:$PATH"
-      export LD_LIBRARY_PATH="/opt/csw/lib/amd64/:.libs:src/libbson/.libs"
-      ;;
-
    *)
       #if test -f /tmp/drivers.keytab; then
          # See CDRIVER-2000
@@ -89,10 +84,6 @@ case "$OS" in
       test-libmongoc.exe -d -F test-results.json
       ;;
 
-   sunos)
-      gmake -o test-libmongoc test TEST_ARGS="--no-fork -d -F test-results.json"
-      ;;
-
    *)
       make -o test-libmongoc test TEST_ARGS="--no-fork -d -F test-results.json"
       ;;

CONTRIBUTING.md

@@ -21,7 +21,6 @@ operating systems and architectures.
  * FreeBSD (10 and newer)
  * Windows (Vista and newer)
  * macOS (10.8 and newer)
- * Solaris x86_64/SPARC (11 and newer)
  * ARM/SPARC/x86/x86_64
 
 

doc/installing.rst

@@ -16,7 +16,6 @@ The MongoDB C Driver is `continuously tested <https://evergreen.mongodb.com/wate
 - Microsoft Windows Server 2008
 - RHEL 7.0, 7.1, 7.2
 - SUSE 12
-- smartOS (sunos / Solaris)
 - Ubuntu 12.04, 14.04, 16.04
 - Clang 3.4, 3.5, 3.7, 3.8
 - GCC 4.6, 4.8, 4.9, 5.3

src/mongoc/mongoc-openssl.c

@@ -73,11 +73,6 @@ _mongoc_openssl_init (void)
    _mongoc_openssl_thread_startup ();
 #endif
 
-   /*
-    * Ensure we also load the ciphers now from the primary thread
-    * or we can run into some weirdness on 64-bit Solaris 10 on
-    * SPARC with openssl 0.9.7.
-    */
    ctx = SSL_CTX_new (SSLv23_method ());
    if (!ctx) {
       MONGOC_ERROR ("Failed to initialize OpenSSL.");

tests/test-mongoc-stream-tls-error.c

@@ -336,14 +336,13 @@ test_mongoc_tls_handshake_stall (void)
 void
 test_stream_tls_error_install (TestSuite *suite)
 {
-/* TLS stream doesn't detect hangup promptly on Solaris for some reason */
 #if !defined(MONGOC_ENABLE_SSL_SECURE_CHANNEL) && \
    !defined(MONGOC_ENABLE_SSL_LIBRESSL)
-#if !defined(__sun) && !defined(__APPLE__)
+#if !defined(__APPLE__)
    TestSuite_Add (suite, "/TLS/hangup", test_mongoc_tls_hangup);
 #endif
 
-   /* CDRIVER-2222 this should be reenabled for Apple Secure Channel too */
+/* CDRIVER-2222 this should be reenabled for Apple Secure Channel too */
 #if !defined(MONGOC_ENABLE_SSL_SECURE_CHANNEL)
    TestSuite_Add (
       suite, "/TLS/handshake_stall", test_mongoc_tls_handshake_stall);