ports/114472: devel/git: bump to 1.5.2.3, fix SHA1 dependency

[Ed Schouten]

>Number:         114472
>Category:       ports
>Synopsis:       devel/git: bump to 1.5.2.3, fix SHA1 dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 10 13:10:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Ed Schouten
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD palm.hoeg.nl 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu Jul 5 19:51:49 CEST 2007 ed at palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
Git makes use of SHA1 to perform hashing of changesets. By default, it
makes use of OpenSSL (libcrypto), but it can also use the Mozilla SHA1
library routines.

The Git port doesn't depend on OpenSSL, though it links against it
(-CURRENT box with Git 1.5.2.1):

| /usr/local/bin/git-verify-pack:
|         libz.so.4 => /lib/libz.so.4 (0x28103000)
|         libiconv.so.3 => /usr/local/lib/libiconv.so.3 (0x28115000)
|         libcrypto.so.5 => /lib/libcrypto.so.5 (0x28203000)
|         libc.so.7 => /lib/libc.so.7 (0x2835b000)
>How-To-Repeat:
>Fix:
The following patch bumps Git to 1.5.2.3 (no plist changes) and makes
Git tools link against libmd (RELENG_6 box with the patched port):

| /usr/local/bin/git-verify-pack:
| 	libz.so.3 => /lib/libz.so.3 (0x280f7000)
| 	libiconv.so.3 => /usr/local/lib/libiconv.so.3 (0x28108000)
| 	libmd.so.3 => /lib/libmd.so.3 (0x281f5000)
| 	libc.so.6 => /lib/libc.so.6 (0x28203000)

--- devel/git/Makefile	Mon Jul  9 22:55:46 2007
+++ devel/git/Makefile	Tue Jul 10 14:53:08 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.5.2.1
+PORTVERSION=	1.5.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -172,7 +172,8 @@
 		WITH_P4IMPORT=yes \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PYTHON_PATH=${LOCALBASE}/bin/python \
-		PERL_PATH=${PERL}
+		PERL_PATH=${PERL} \
+		LIBMD_SHA1=yes
 MAKE_ARGS+=	prefix="${PREFIX}"
 
 .ifndef WITHOUT_GUI
--- devel/git/distinfo	Mon Jul  9 22:55:46 2007
+++ devel/git/distinfo	Tue Jul 10 14:55:11 2007
@@ -1,6 +1,6 @@
-MD5 (git-1.5.2.1.tar.bz2) = 0a39e786a12974cbe7b14f2fe92dc163
-SHA256 (git-1.5.2.1.tar.bz2) = 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37
-SIZE (git-1.5.2.1.tar.bz2) = 1184392
-MD5 (git-manpages-1.5.2.1.tar.bz2) = e9da37e899167a4f36a71c8fee46e6a0
-SHA256 (git-manpages-1.5.2.1.tar.bz2) = f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f
-SIZE (git-manpages-1.5.2.1.tar.bz2) = 139651
+MD5 (git-1.5.2.3.tar.bz2) = 8bb8995f098826154178d5f2d926b6c6
+SHA256 (git-1.5.2.3.tar.bz2) = d7a92ec68849cc8b333f10263ea3c9c19ccc99fe9b581b5769fb729b14ac54ac
+SIZE (git-1.5.2.3.tar.bz2) = 1191521
+MD5 (git-manpages-1.5.2.3.tar.bz2) = 04c7b173c30871b012297f6aa76abcb1
+SHA256 (git-manpages-1.5.2.3.tar.bz2) = 39b4029e064ed748fb1631ff623d5a10c2809b3262e55cf9e6aee701ce032a92
+SIZE (git-manpages-1.5.2.3.tar.bz2) = 139820
--- devel/git/files/patch-Makefile	Mon May 28 01:43:32 2007
+++ devel/git/files/patch-Makefile	Tue Jul 10 14:50:48 2007
@@ -32,3 +32,22 @@
  
  export TCL_PATH TCLTK_PATH
  
+@@ -634,6 +634,10 @@
+ 	BASIC_CFLAGS += -DOLD_ICONV
+ endif
+ 
++ifdef LIBMD_SHA1
++	SHA1_HEADER = "sha.h"
++	EXTLIBS += -lmd
++else
+ ifdef PPC_SHA1
+ 	SHA1_HEADER = "ppc/sha1.h"
+ 	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
+@@ -648,6 +652,7 @@
+ else
+ 	SHA1_HEADER = <openssl/sha.h>
+ 	EXTLIBS += $(LIB_4_CRYPTO)
++endif
+ endif
+ endif
+ endif
>Release-Note:
>Audit-Trail:
>Unformatted: