CVS commit: pkgsrc/devel/git-base

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct  5 18:09:33 UTC 2025

Modified Files:
        pkgsrc/devel/git-base: distinfo options.mk
Added Files:
        pkgsrc/devel/git-base/patches: patch-t-helper-test-rot13-filter.c
            patch-t_unit-tests_clar_clar_sandbox.h

Log Message:
devel/git-base: Make openssl optional and fix compiling on QNX

Doesn't work on QNX yet: It fails to fork when trying to clone a repo.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/git-base/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/git-base/patches/patch-t-helper-test-rot13-filter.c \
    pkgsrc/devel/git-base/patches/patch-t_unit-tests_clar_clar_sandbox.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.157 pkgsrc/devel/git-base/distinfo:1.158
--- pkgsrc/devel/git-base/distinfo:1.157        Mon Aug 18 19:36:35 2025
+++ pkgsrc/devel/git-base/distinfo      Sun Oct  5 18:09:33 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.157 2025/08/18 19:36:35 adam Exp $
+$NetBSD: distinfo,v 1.158 2025/10/05 18:09:33 js Exp $
 
 BLAKE2s (git-2.51.0.tar.xz) = a6f9ca63b9af0ec1ed1024935697c19267b4aae2aeef07273a164c7abddafb2b
 SHA512 (git-2.51.0.tar.xz) = 2b8c59589266c0c9e58a9f4fda4a970a8a492e2e0ecbafc414fcfacac4a04251f0115b3676f4599a415b53906f1dea312b18a42e9bde455286abd62ec327beaf
@@ -10,4 +10,6 @@ SHA1 (patch-contrib_completion_git-compl
 SHA1 (patch-dircompat.h) = f0cf20a95f2144c0dee17a2aa45955c57141452d
 SHA1 (patch-git-gui_Makefile) = 16f0f2679a24aabc09af26ef1cc5b338993b6c12
 SHA1 (patch-gitk-git_Makefile) = 028fa483f20f40ae3ec81c2dc7bd2e412a7d17f0
+SHA1 (patch-t-helper-test-rot13-filter.c) = 6694898541213cc235e9d9053cbc021b6dd3b2e5
+SHA1 (patch-t_unit-tests_clar_clar_sandbox.h) = 3ab8d6180948207c5dcf1fc0bd68ad292c5c4ffa
 SHA1 (patch-templates_Makefile) = a5bd26b4e37ab5337f10d52565156c2e21e7ba93

Index: pkgsrc/devel/git-base/options.mk
diff -u pkgsrc/devel/git-base/options.mk:1.6 pkgsrc/devel/git-base/options.mk:1.7
--- pkgsrc/devel/git-base/options.mk:1.6        Mon Jun 12 21:41:59 2023
+++ pkgsrc/devel/git-base/options.mk    Sun Oct  5 18:09:33 2025
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.6 2023/06/12 21:41:59 schmonz Exp $
+# $NetBSD: options.mk,v 1.7 2025/10/05 18:09:33 js Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.git
-PKG_SUPPORTED_OPTIONS= apple-common-crypto
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS= apple-common-crypto openssl
+PKG_SUGGESTED_OPTIONS= 
+.if ${OPSYS} != "QNX"
+PKG_SUGGESTED_OPTIONS+=        openssl
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,8 +14,11 @@ PKG_SUGGESTED_OPTIONS=
 PKG_FAIL_REASON+=      "apple-common-crypto not available on this system"
 .  endif
 CONFIGURE_ARGS+=       --without-openssl
-.else
-CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
+.elif !empty(PKG_OPTIONS:Mopenssl)
 .include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
+MAKE_FLAGS+=           NO_APPLE_COMMON_CRYPTO=1
+.else
+CONFIGURE_ARGS+=       --without-openssl
 MAKE_FLAGS+=           NO_APPLE_COMMON_CRYPTO=1
 .endif

Added files:

Index: pkgsrc/devel/git-base/patches/patch-t-helper-test-rot13-filter.c
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-t-helper-test-rot13-filter.c:1.1
--- /dev/null   Sun Oct  5 18:09:34 2025
+++ pkgsrc/devel/git-base/patches/patch-t-helper-test-rot13-filter.c    Sun Oct  5 18:09:33 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-t-helper-test-rot13-filter.c,v 1.1 2025/10/05 18:09:33 js Exp $
+
+--- t/helper/test-rot13-filter.c.orig  2025-08-18 00:35:38.000000000 +0000
++++ t/helper/test-rot13-filter.c
+@@ -44,6 +44,9 @@
+ 
+ static FILE *logfile;
+ static int always_delay, has_clean_cap, has_smudge_cap;
++#ifdef __QNX__
++# define delay git_delay
++#endif
+ static struct strmap delay = STRMAP_INIT;
+ 
+ static inline const char *str_or_null(const char *str)
Index: pkgsrc/devel/git-base/patches/patch-t_unit-tests_clar_clar_sandbox.h
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-t_unit-tests_clar_clar_sandbox.h:1.1
--- /dev/null   Sun Oct  5 18:09:34 2025
+++ pkgsrc/devel/git-base/patches/patch-t_unit-tests_clar_clar_sandbox.h        Sun Oct  5 18:09:33 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-t_unit-tests_clar_clar_sandbox.h,v 1.1 2025/10/05 18:09:33 js Exp $
+
+--- t/unit-tests/clar/clar/sandbox.h.orig      2025-08-18 00:35:38.000000000 +0000
++++ t/unit-tests/clar/clar/sandbox.h
+@@ -128,7 +128,7 @@ static int build_sandbox_path(void)
+ 
+       if (mkdir(_clar_path, 0700) != 0)
+               return -1;
+-#elif defined(__sun) || defined(__TANDEM)
++#elif defined(__sun) || defined(__TANDEM) || defined(__QNX__)
+       if (mktemp(_clar_path) == NULL)
+               return -1;
+