From 5a654f11bbbbf509bf01b603339eb8917d24656f Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Tue, 31 Dec 2024 13:06:26 +0000
Subject: [PATCH] cmake: update git2_features.h

Reorganize the libgit2 feature selection file.
---
 src/util/git2_features.h.in | 76 ++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/util/git2_features.h.in b/src/util/git2_features.h.in
index 02a5c8113..7e94835e8 100644
--- a/src/util/git2_features.h.in
+++ b/src/util/git2_features.h.in
@@ -1,20 +1,37 @@
 #ifndef INCLUDE_features_h__
 #define INCLUDE_features_h__
 
+/* Debugging options */
+
 #cmakedefine GIT_DEBUG_POOL 1
 #cmakedefine GIT_DEBUG_STRICT_ALLOC 1
 #cmakedefine GIT_DEBUG_STRICT_OPEN 1
 #cmakedefine GIT_DEBUG_LEAKCHECK_WIN32 1
 
+/* Feature enablement and provider / backend selection */
+
 #cmakedefine GIT_THREADS 1
 #cmakedefine GIT_THREADS_PTHREADS 1
 #cmakedefine GIT_THREADS_WIN32 1
 
-#cmakedefine GIT_ARCH_64 1
-#cmakedefine GIT_ARCH_32 1
+#cmakedefine GIT_SHA1_BUILTIN 1
+#cmakedefine GIT_SHA1_OPENSSL 1
+#cmakedefine GIT_SHA1_OPENSSL_FIPS 1
+#cmakedefine GIT_SHA1_OPENSSL_DYNAMIC 1
+#cmakedefine GIT_SHA1_MBEDTLS 1
+#cmakedefine GIT_SHA1_COMMON_CRYPTO 1
+#cmakedefine GIT_SHA1_WIN32 1
 
-#cmakedefine GIT_I18N 1
-#cmakedefine GIT_I18N_ICONV 1
+#cmakedefine GIT_SHA256_BUILTIN 1
+#cmakedefine GIT_SHA256_WIN32 1
+#cmakedefine GIT_SHA256_COMMON_CRYPTO 1
+#cmakedefine GIT_SHA256_OPENSSL 1
+#cmakedefine GIT_SHA256_OPENSSL_FIPS 1
+#cmakedefine GIT_SHA256_OPENSSL_DYNAMIC 1
+#cmakedefine GIT_SHA256_MBEDTLS 1
+
+#cmakedefine GIT_COMPRESSION_BUILTIN 1
+#cmakedefine GIT_COMPRESSION_ZLIB 1
 
 #cmakedefine GIT_NSEC 1
 #cmakedefine GIT_NSEC_MTIM 1
@@ -22,7 +39,8 @@
 #cmakedefine GIT_NSEC_MTIME_NSEC 1
 #cmakedefine GIT_NSEC_WIN32 1
 
-#cmakedefine GIT_FUTIMENS 1
+#cmakedefine GIT_I18N 1
+#cmakedefine GIT_I18N_ICONV 1
 
 #cmakedefine GIT_REGEX_REGCOMP_L 1
 #cmakedefine GIT_REGEX_REGCOMP 1
@@ -30,25 +48,11 @@
 #cmakedefine GIT_REGEX_PCRE2 1
 #cmakedefine GIT_REGEX_BUILTIN 1
 
-#cmakedefine GIT_QSORT_BSD 1
-#cmakedefine GIT_QSORT_GNU 1
-#cmakedefine GIT_QSORT_C11 1
-#cmakedefine GIT_QSORT_MSC 1
-
 #cmakedefine GIT_SSH 1
 #cmakedefine GIT_SSH_EXEC 1
 #cmakedefine GIT_SSH_LIBSSH2 1
 #cmakedefine GIT_SSH_LIBSSH2_MEMORY_CREDENTIALS 1
 
-#cmakedefine GIT_AUTH_NTLM 1
-#cmakedefine GIT_AUTH_NTLM_BUILTIN 1
-#cmakedefine GIT_AUTH_NTLM_SSPI 1
-
-#cmakedefine GIT_AUTH_NEGOTIATE 1
-#cmakedefine GIT_AUTH_NEGOTIATE_GSSFRAMEWORK 1
-#cmakedefine GIT_AUTH_NEGOTIATE_GSSAPI 1
-#cmakedefine GIT_AUTH_NEGOTIATE_SSPI 1
-
 #cmakedefine GIT_HTTPS 1
 #cmakedefine GIT_HTTPS_OPENSSL 1
 #cmakedefine GIT_HTTPS_OPENSSL_DYNAMIC 1
@@ -61,24 +65,26 @@
 #cmakedefine GIT_HTTPPARSER_LLHTTP 1
 #cmakedefine GIT_HTTPPARSER_BUILTIN 1
 
-#cmakedefine GIT_SHA1_BUILTIN 1
-#cmakedefine GIT_SHA1_WIN32 1
-#cmakedefine GIT_SHA1_COMMON_CRYPTO 1
-#cmakedefine GIT_SHA1_OPENSSL 1
-#cmakedefine GIT_SHA1_OPENSSL_FIPS 1
-#cmakedefine GIT_SHA1_OPENSSL_DYNAMIC 1
-#cmakedefine GIT_SHA1_MBEDTLS 1
+#cmakedefine GIT_AUTH_NTLM 1
+#cmakedefine GIT_AUTH_NTLM_BUILTIN 1
+#cmakedefine GIT_AUTH_NTLM_SSPI 1
 
-#cmakedefine GIT_SHA256_BUILTIN 1
-#cmakedefine GIT_SHA256_WIN32 1
-#cmakedefine GIT_SHA256_COMMON_CRYPTO 1
-#cmakedefine GIT_SHA256_OPENSSL 1
-#cmakedefine GIT_SHA256_OPENSSL_FIPS 1
-#cmakedefine GIT_SHA256_OPENSSL_DYNAMIC 1
-#cmakedefine GIT_SHA256_MBEDTLS 1
+#cmakedefine GIT_AUTH_NEGOTIATE 1
+#cmakedefine GIT_AUTH_NEGOTIATE_GSSFRAMEWORK 1
+#cmakedefine GIT_AUTH_NEGOTIATE_GSSAPI 1
+#cmakedefine GIT_AUTH_NEGOTIATE_SSPI 1
 
-#cmakedefine GIT_COMPRESSION_BUILTIN 1
-#cmakedefine GIT_COMPRESSION_ZLIB 1
+/* Platform details */
+
+#cmakedefine GIT_ARCH_64 1
+#cmakedefine GIT_ARCH_32 1
+
+#cmakedefine GIT_QSORT_BSD 1
+#cmakedefine GIT_QSORT_GNU 1
+#cmakedefine GIT_QSORT_C11 1
+#cmakedefine GIT_QSORT_MSC 1
+
+#cmakedefine GIT_FUTIMENS 1
 
 #cmakedefine GIT_RAND_GETENTROPY 1
 #cmakedefine GIT_RAND_GETLOADAVG 1