From da79638e4ae2d8af2245bc9db0b3435d8f39763e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 22 May 2021 14:34:38 -0400 Subject: [PATCH] remove unneeded NEEDS_CRYPTO_WITH_SSL The NEEDS_CRYPTO_WITH_SSL Makefile knob was added in 7878348 (Update to git-1.7.0 - Link imap-send with libcrypto (#565147) - Disable building of unused python remote helper libs, 2010-02-15). It is no longer needed. I'm not sure when it stopped being necessary, though I am sure I tried removing once before in the 11 years since it was added. Builds on Fedora and EL7/EL8 all properly pick up the -lssl -lcrypto flags when compiling git-imap-send. Incidentally, git-imap-send has used libcurl for handling IMAP rather than low-level OpenSSL-based functions on Fedora since upstream commit dbba42bb32 (imap-send: use curl by default when possible, 2017-09-14). This applies to EL8 as well. On EL7, libcurl is too old (>= 7.34.0 is required). --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d36ba7c..775f89c 100644 --- a/git.spec +++ b/git.spec @@ -513,7 +513,6 @@ cat << \EOF | tee config.mak V = 1 CFLAGS = %{build_cflags} LDFLAGS = %{build_ldflags} -NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig INSTALL_SYMLINKS = 1 @@ -1000,6 +999,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" - rearrange python2/python3 conditionals - re-enable git-p4 with python3 - add coreutils BuildRequires +- remove unneeded NEEDS_CRYPTO_WITH_SSL * Fri May 21 2021 Jitka Plesnikova - 2.31.1-3.1 - Perl 5.34 rebuild