libmongocrypt-helper 1.8.0.0.1001 → 1.11.0.0.1001

data/ext/libmongocrypt/libmongocrypt/etc/calc_release_version.py

@@ -22,11 +22,35 @@ branch and/or recent tags in history) to assign to a tarball generated from the
 current Git commit.
 """
 
+# XXX NOTE XXX NOTE XXX NOTE XXX
+# After modifying this script it is advisable to execute the self-test.
+#
+# This is done by starting in the directory containing this script and then
+# executing a separate self-test script, like this:
+#
+# $ bash ./calc_release_version_selftest.sh
+#
+# The self-test script will emit diagnostic output. If tracing of the execution
+# of each command is desired, then add the -x option to the bash invocation.
+# XXX NOTE XXX NOTE XXX NOTE XXX
+
 import datetime
 import re
 import subprocess
 import sys
-from distutils.version import LooseVersion
+try:
+    # Prefer newer `packaging` over deprecated packages.
+    from packaging.version import Version as Version
+    from packaging.version import parse as parse_version
+except ImportError:
+    # Fallback to deprecated pkg_resources.
+    try:
+        from pkg_resources.extern.packaging.version import Version
+        from pkg_resources import parse_version
+    except ImportError:
+        # Fallback to deprecated distutils.
+        from distutils.version import LooseVersion as Version
+        from distutils.version import LooseVersion as parse_version
 
 DEBUG = len(sys.argv) > 1 and '-d' in sys.argv
 if DEBUG:
@@ -70,7 +94,8 @@ def check_head_tag():
     """
 
     found_tag = False
-    version_loose = LooseVersion('0.0.0')
+    version_str = '0.0.0'
+    version_parsed = parse_version(version_str)
 
     # have git tell us if any tags that look like release tags point at HEAD;
     # based on our policy, a commit should never have more than one release tag
@@ -83,17 +108,19 @@ def check_head_tag():
 
     release_tag_match = RELEASE_TAG_RE.match(tag)
     if release_tag_match:
-        new_version_loose = LooseVersion(release_tag_match.group('ver'))
-        if new_version_loose > version_loose:
+        new_version_str = release_tag_match.group('ver')
+        new_version_parsed = parse_version(new_version_str)
+        if new_version_parsed > version_parsed:
             if DEBUG:
-                print('HEAD release tag: ' + release_tag_match.group('ver'))
-            version_loose = new_version_loose
+                print('HEAD release tag: ' + new_version_str)
+            version_str = new_version_str
+            version_parsed = new_version_parsed
             found_tag = True
 
     if found_tag:
         if DEBUG:
-            print('Calculated version: ' + str(version_loose))
-        return str(version_loose)
+            print('Calculated version: ' + version_str)
+        return version_str
 
     return None
 
@@ -106,7 +133,8 @@ def get_next_minor(prerelease_marker):
         - Append a pre-release marker. (e.g. 1.22.0 becomes 1.22.0-20220201+gitf6e6a7025d)
     """
 
-    version_loose = LooseVersion('0.0.0')
+    version_str = '0.0.0'
+    version_parsed = parse_version(version_str)
 
     version_new = {}
     # Use refs (not branches) to get local branches plus remote branches
@@ -119,17 +147,19 @@ def get_next_minor(prerelease_marker):
             version_new['minor'] = int(release_branch_match.group('vermin')) + 1
             version_new['patch'] = 0
             version_new['prerelease'] = prerelease_marker
-            new_version_loose = LooseVersion(str(version_new['major']) + '.' +
-                                             str(version_new['minor']) + '.' +
-                                             str(version_new['patch']) + '-' +
-                                             version_new['prerelease'])
-            if new_version_loose > version_loose:
-                version_loose = new_version_loose
+            new_version_str = str(version_new['major']) + '.' + \
+                              str(version_new['minor']) + '.' + \
+                              str(version_new['patch']) + '-' + \
+                              version_new['prerelease']
+            new_version_parsed = parse_version(new_version_str)
+            if new_version_parsed > version_parsed:
+                version_str = new_version_str
+                version_parsed = new_version_parsed
                 if DEBUG:
-                    print('Found new best version "' + str(version_loose) \
+                    print('Found new best version "' + version_str \
                             + '" based on branch "' \
                             + release_branch_match.group('brname') + '"')
-    return str(version_loose)
+    return version_str
 
 def get_branch_tags(active_branch_name):
     """
@@ -167,7 +197,7 @@ def get_branch_tags(active_branch_name):
 def process_and_sort_tags(tags):
     """
     Given a string (as returned from get_branch_tags), return a sorted list of
-    zero or more tags (sorted based on the LooseVersion comparison) which meet
+    zero or more tags (sorted based on the Version comparison) which meet
     the following criteria:
         - a final release tag (i.e., 1.x.y without any pre-release suffix)
         - a pre-release tag which is not superseded by a release tag (i.e.,
@@ -190,7 +220,7 @@ def process_and_sort_tags(tags):
         tag_parts = tag.split('-')
         if len(tag_parts) >= 2 and tag_parts[0] not in processed_and_sorted_tags:
             processed_and_sorted_tags.append(tag)
-    processed_and_sorted_tags.sort(key=LooseVersion)
+    processed_and_sorted_tags.sort(key=Version)
 
     return processed_and_sorted_tags
 
@@ -211,7 +241,8 @@ def main():
            patch version, and append a new pre-release marker
     """
 
-    version_loose = LooseVersion('0.0.0')
+    version_str = '0.0.0'
+    version_parsed = parse_version(version_str)
     head_commit_short = check_output(['git', 'rev-parse', '--revs-only',
                                       '--short=10', 'HEAD^{commit}']).strip()
     prerelease_marker = datetime.date.today().strftime('%Y%m%d') \
@@ -246,17 +277,19 @@ def main():
         version_new['minor'] = int(release_tag_match.group('vermin'))
         version_new['patch'] = int(release_tag_match.group('verpatch')) + 1
         version_new['prerelease'] = prerelease_marker
-        new_version_loose = LooseVersion(str(version_new['major']) + '.' +
-                                         str(version_new['minor']) + '.' +
-                                         str(version_new['patch']) + '-' +
-                                         version_new['prerelease'])
-        if new_version_loose > version_loose:
-            version_loose = new_version_loose
+        new_version_str = str(version_new['major']) + '.' + \
+                          str(version_new['minor']) + '.' + \
+                          str(version_new['patch']) + '-' + \
+                          version_new['prerelease']
+        new_version_parsed = parse_version(new_version_str)
+        if new_version_parsed > version_parsed:
+            version_str = new_version_str
+            version_parsed = new_version_parsed
             if DEBUG:
-                print('Found new best version "' + str(version_loose) \
+                print('Found new best version "' + version_str \
                         + '" from tag "' + release_tag_match.group('ver') + '"')
 
-    return str(version_loose)
+    return version_str
 
 RELEASE_VER = main()
 

data/ext/libmongocrypt/libmongocrypt/etc/calc_release_version_selftest.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+# calc_release_version_selftest.sh is used to test output of calc_release_version.py.
+# run with:
+# cd etc
+# ./calc_release_version_selftest.sh
+
+set -o errexit
+set -o pipefail
+
+function assert_eq () {
+    a="$1"
+    b="$2"
+    if [[ "$a" != "$b" ]]; then
+        echo "Assertion failed: $a != $b"
+        # Print caller
+        caller
+        exit 1
+    fi
+}
+
+SAVED_REF=$(git rev-parse HEAD)
+
+function cleanup () {
+    [[ -e calc_release_version_test.py ]] && rm calc_release_version_test.py
+    git checkout $SAVED_REF --quiet
+}
+
+trap cleanup EXIT
+
+: ${PYTHON_INTERP:=python}
+if [[ -z $(command -v "${PYTHON_INTERP}") ]]; then
+    echo "Python interpreter '${PYTHON_INTERP}' is not valid."
+    echo "Set the PYTHON_INTERP environment variable to a valid interpreter."
+    exit 1
+fi
+
+# copy calc_release_version.py to a separate file not tracked by git so it does not change on `git checkout`
+cp calc_release_version.py calc_release_version_test.py
+
+echo "Test a tagged commit ... begin"
+{
+    git checkout 1.8.1 --quiet
+    got=$("${PYTHON_INTERP}" calc_release_version_test.py)
+    assert_eq "$got" "1.8.1"
+    git checkout - --quiet
+}
+echo "Test a tagged commit ... end"
+
+DATE=$(date +%Y%m%d)
+echo "Test an untagged commit ... begin"
+{
+    # b7f8a1f1502d28a5ef440e642fddda8da8f873a1 is commit before 1.8.1
+    git checkout b7f8a1f1502d28a5ef440e642fddda8da8f873a1 --quiet
+    got=$("${PYTHON_INTERP}" calc_release_version_test.py)
+    assert_eq "$got" "1.8.1-$DATE+gitb7f8a1f150"
+    git checkout - --quiet
+}
+echo "Test an untagged commit ... end"
+
+echo "Test next minor version ... begin"
+{
+    CURRENT_SHORTREF=$(git rev-parse --revs-only --short=10 HEAD)
+    got=$("${PYTHON_INTERP}" calc_release_version_test.py --next-minor)
+    # XXX NOTE XXX NOTE XXX
+    # If you find yourself looking at this line because the assertion below
+    # failed, then it is probably because a new major/minor release was made.
+    # Update the expected output to represent the correct next version.
+    # XXX NOTE XXX NOTE XXX
+    assert_eq "$got" "1.9.0-$DATE+git$CURRENT_SHORTREF"
+}
+echo "Test next minor version ... end"
+
+echo "All tests passed"

data/ext/libmongocrypt/libmongocrypt/etc/cyclonedx.sbom.json

@@ -0,0 +1,108 @@
+{
+  "components": [
+    {
+      "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.27.1#src/libbson",
+      "copyright": "Copyright 2009-present MongoDB, Inc.",
+      "externalReferences": [
+        {
+          "type": "distribution",
+          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.27.1.tar.gz"
+        },
+        {
+          "type": "website",
+          "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.27.1"
+        }
+      ],
+      "group": "mongodb",
+      "licenses": [
+        {
+          "license": {
+            "id": "Apache-2.0"
+          }
+        }
+      ],
+      "name": "mongo-c-driver",
+      "purl": "pkg:github/mongodb/mongo-c-driver@v1.27.1#src/libbson",
+      "type": "library",
+      "version": "v1.27.1"
+    },
+    {
+      "bom-ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz",
+      "copyright": "Copyright (c) 2018, Intel Corp.",
+      "externalReferences": [
+        {
+          "type": "distribution",
+          "url": "https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz"
+        }
+      ],
+      "licenses": [
+        {
+          "license": {
+            "id": "BSD-3-Clause"
+          }
+        }
+      ],
+      "name": "IntelRDFPMathLib",
+      "purl": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz",
+      "type": "library",
+      "version": "20U2"
+    }
+  ],
+  "dependencies": [
+    {
+      "ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz"
+    },
+    {
+      "ref": "pkg:github/mongodb/mongo-c-driver@v1.27.1#src/libbson"
+    }
+  ],
+  "metadata": {
+    "timestamp": "2024-05-10T12:07:55.084050+00:00",
+    "tools": [
+      {
+        "externalReferences": [
+          {
+            "type": "build-system",
+            "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions"
+          },
+          {
+            "type": "distribution",
+            "url": "https://pypi.org/project/cyclonedx-python-lib/"
+          },
+          {
+            "type": "documentation",
+            "url": "https://cyclonedx-python-library.readthedocs.io/"
+          },
+          {
+            "type": "issue-tracker",
+            "url": "https://github.com/CycloneDX/cyclonedx-python-lib/issues"
+          },
+          {
+            "type": "license",
+            "url": "https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/LICENSE"
+          },
+          {
+            "type": "release-notes",
+            "url": "https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CHANGELOG.md"
+          },
+          {
+            "type": "vcs",
+            "url": "https://github.com/CycloneDX/cyclonedx-python-lib"
+          },
+          {
+            "type": "website",
+            "url": "https://github.com/CycloneDX/cyclonedx-python-lib/#readme"
+          }
+        ],
+        "name": "cyclonedx-python-lib",
+        "vendor": "CycloneDX",
+        "version": "6.4.4"
+      }
+    ]
+  },
+  "serialNumber": "urn:uuid:879e1b41-08d8-4505-8c89-2285bc3e442c",
+  "version": 1,
+  "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.5"
+}

data/ext/libmongocrypt/libmongocrypt/etc/format.sh

@@ -10,7 +10,7 @@ if ! run_python -c ''; then
 fi
 
 # Check that we have a pipx of the proper version:
-run_python -c 'import pkg_resources; pkg_resources.require("pipx>=0.17.0<2.0")'
+run_python -c 'import pkg_resources; pkg_resources.require("pipx>=0.17.0,<2.0")'
 
 # Give default clang-format an empty string on stdin if there are no inputs files
 printf '' | run_python -m pipx run "clang-format==${CLANG_FORMAT_VERSION:?}" "$@"

data/ext/libmongocrypt/libmongocrypt/etc/libbson-remove-GCC-diagnostic-pragma.patch

@@ -0,0 +1,27 @@
+diff --git a/src/common/bson-dsl.h b/src/common/bson-dsl.h
+index 58a14e28e..3341e603f 100644
+--- a/src/common/bson-dsl.h
++++ b/src/common/bson-dsl.h
+@@ -29,6 +29,13 @@ enum {
+    BSON_IF_WINDOWS (__declspec (selectany)) \
+    BSON_IF_POSIX (__attribute__ ((weak)))
+ 
++#if defined(__GNUC__) && !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
++// Using GCC < 4.6
++// Do not define `GCC diagnostic` pragma for GCC < 4.6.
++#define _bsonDSL_disableWarnings() ((void) 0)
++#define _bsonDSL_restoreWarnings() ((void) 0)
++#else
++// Not using GCC < 4.6
+ #ifdef __GNUC__
+ // GCC has a bug handling pragma statements that disable warnings within complex
+ // nested macro expansions. If we're GCC, just disable -Wshadow outright:
+@@ -47,7 +54,7 @@ BSON_IF_GNU_LIKE (_Pragma ("GCC diagnostic ignored \"-Wshadow\""))
+       BSON_IF_GNU_LIKE (_Pragma ("GCC diagnostic pop");) \
+    } else                                                \
+       ((void) 0)
+-
++#endif
+ /**
+  * @brief Parse the given BSON document.
+  *

data/ext/libmongocrypt/libmongocrypt/etc/mongo-inteldfp-alpine-arm-fix.patch

@@ -0,0 +1,17 @@
+diff --git a/cmake-build/_deps/intel_dfp-src/LIBRARY/src/bid_functions.h b/cmake-build/_deps/intel_dfp-src/LIBRARY/src/bid_functions.h
+index 7042eed..e55f59e 100755
+--- a/cmake-build/_deps/intel_dfp-src/LIBRARY/src/bid_functions.h
++++ b/cmake-build/_deps/intel_dfp-src/LIBRARY/src/bid_functions.h
+@@ -41,12 +41,6 @@
+ #endif
+ #include <ctype.h>
+ 
+-// Fix system header issue on Sun solaris and define required type by ourselves
+-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(__cplusplus)
+-typedef int   wchar_t;
+-#endif
+-
+-
+ #ifdef IN_LIBGCC2
+ // When we are built as the part of the gcc runtime library, libgcc,
+ // we will use gcc types defined in bid_gcc_intrinsics.h.