[RFC PATCH 3/3] Makefile: avoid deprecation warnings on OS X 10.8

2013-05-09 Thread David Aguilar
Mac OS X Mountain Lion prints warnings when building git:

warning: 'SHA1_Init' is deprecated
(declared at /usr/include/openssl/sha.h:121)

Silence the warnings by disabling OpenSSH in favor of BLK_SHA1.

Signed-off-by: David Aguilar dav...@gmail.com
---
I know I can create config.mak, but do we prefer to have the default
settings be warning-free?  I do not see any other platforms that tweak
NO_OPENSSL themselves, hence RFC.  Is there a better way to do this?
Are there any Darwin/PPC users that would be harmed by this patch?

 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 0f931a2..3bb9ac2 100644
--- a/Makefile
+++ b/Makefile
@@ -1055,6 +1055,7 @@ ifeq ($(uname_S),Darwin)
endif
endif
PTHREAD_LIBS =
+   NO_OPENSSL = YesPlease
 endif
 
 ifndef CC_LD_DYNPATH
-- 
1.8.3.rc1.38.g0f1704c

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [RFC PATCH 3/3] Makefile: avoid deprecation warnings on OS X 10.8

2013-05-09 Thread John Keeping
On Thu, May 09, 2013 at 02:13:30AM -0700, David Aguilar wrote:
 Mac OS X Mountain Lion prints warnings when building git:
 
   warning: 'SHA1_Init' is deprecated
   (declared at /usr/include/openssl/sha.h:121)
 
 Silence the warnings by disabling OpenSSH in favor of BLK_SHA1.
 
 Signed-off-by: David Aguilar dav...@gmail.com
 ---
 I know I can create config.mak, but do we prefer to have the default
 settings be warning-free?  I do not see any other platforms that tweak
 NO_OPENSSL themselves, hence RFC.  Is there a better way to do this?
 Are there any Darwin/PPC users that would be harmed by this patch?

Disabling OpenSSL also has the effect of disabling SSL support in
git-imap-send.  Does enabling BLK_SHA1 instead also remove the warnings?

Alternatively, it seems that the recommended update is to use Apple's
CommonCrypto library, as in this patch:
https://gist.github.com/anonymous/4466305
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [RFC PATCH 3/3] Makefile: avoid deprecation warnings on OS X 10.8

2013-05-09 Thread David Aguilar
On Thu, May 9, 2013 at 8:14 AM, John Keeping j...@keeping.me.uk wrote:
 On Thu, May 09, 2013 at 02:13:30AM -0700, David Aguilar wrote:
 Mac OS X Mountain Lion prints warnings when building git:

   warning: 'SHA1_Init' is deprecated
   (declared at /usr/include/openssl/sha.h:121)

 Silence the warnings by disabling OpenSSH in favor of BLK_SHA1.

 Signed-off-by: David Aguilar dav...@gmail.com
 ---
 I know I can create config.mak, but do we prefer to have the default
 settings be warning-free?  I do not see any other platforms that tweak
 NO_OPENSSL themselves, hence RFC.  Is there a better way to do this?
 Are there any Darwin/PPC users that would be harmed by this patch?

 Disabling OpenSSL also has the effect of disabling SSL support in
 git-imap-send.  Does enabling BLK_SHA1 instead also remove the warnings?

Thanks.  Yes, setting BLK_SHA1 does eliminate the warnings.

I'll re-roll this patch and send it independently.
It's unrelated to the mergetool stuff so apologies for the wide
initial Cc: list.

 Alternatively, it seems that the recommended update is to use Apple's
 CommonCrypto library, as in this patch:
 https://gist.github.com/anonymous/4466305

It seems like we'd want something like this in compat-util.h or
somewhere similar.  That'll be a bigger change so I'll try the
BLK_SHA1 approach first since it is minimally invasive.  This would be
nice to tackle once the dust has settled a bit.
--
David
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html