git: Upgrade from 1.6.0.4 to 1.7.0.2

The git-daemon+(x)inetd has a known denial of service problem. Upgrade
to a newer git version just in case. Remove two bogus autoconf patches
that can be done by passing in autoconf varaibles. Switch to local
checksums instead of checksums.ini

8 files changed, 20 insertions, 58 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b7fe8a3cad..e997d16c35 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8854,10 +8854,6 @@ sha256=69b3269a6b1ca26357e1e72c6be7f0ed742cd88d2042243c0bb9ba76e4acac99
 md5=5175d142ad0745b9e22a64904aa86c45
 sha256=692901194603cc4fb4072d8f907487d867caef6b62161f50f0f44dbeb001066e
 
-[http://www.kernel.org/pub/software/scm/git/git-1.6.0.4.tar.bz2]
-md5=ed8c4fa007a44d51b646865c35461ce8
-sha256=f8ccac357f2c721e735ae16bbb02a420d2aaaed483f5d46043c5fe627ab4b260
-
 [http://downloads.sourceforge.net/gizmod/gizmod-2.3.tar.bz2]
 md5=b7200b08149599c4c0f56d88f0c7f208
 sha256=53af32530e58ba23cbb752f063364612bbea57b31de2ee35814973452c2f63f2
diff --git a/recipes/git/files/autotools.patch b/recipes/git/files/autotools.patch
deleted file mode 100644
index 0666118cde..0000000000
--- a/recipes/git/files/autotools.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: git-1.5.2.3/configure.ac
-===================================================================
---- git-1.5.2.3.orig/configure.ac	2007-07-02 10:11:39.000000000 +0200
-+++ git-1.5.2.3/configure.ac	2007-08-04 00:02:13.000000000 +0200
-@@ -235,7 +235,8 @@
- 		else if (strcmp(buf, "12345"))
- 		  exit(2);]])],
- 	[ac_cv_c_c99_format=yes],
--	[ac_cv_c_c99_format=no])
-+	[ac_cv_c_c99_format=no],
-+	[ac_cv_c_c99_format=yes])
- ])
- if test $ac_cv_c_c99_format = no; then
- 	NO_C99_FORMAT=YesPlease
-Index: git-1.5.2.3/config.mak.in
-===================================================================
---- git-1.5.2.3.orig/config.mak.in	2007-07-02 10:11:39.000000000 +0200
-+++ git-1.5.2.3/config.mak.in	2007-08-04 00:07:04.000000000 +0200
-@@ -3,6 +3,7 @@
- 
- CC = @CC@
- CFLAGS = @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- AR = @AR@
- TAR = @TAR@
- #INSTALL = @INSTALL@		# needs install-sh or install.sh in sources
diff --git a/recipes/git/files/snprintf-returns-bogus.patch b/recipes/git/files/snprintf-returns-bogus.patch
deleted file mode 100644
index 568bb1f56b..0000000000
--- a/recipes/git/files/snprintf-returns-bogus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- git-1.6.0.4-orig/configure.ac	2008-11-18 15:28:03.000000000 -0500
-+++ git-1.6.0.4/configure.ac	2008-11-18 15:30:45.000000000 -0500
-@@ -373,7 +373,8 @@
- 		  if (snprintf(buf, 3, "%s", "12345") != 5
- 		      || strcmp(buf, "12")) return 1]])],
- 	[ac_cv_snprintf_returns_bogus=no],
--	[ac_cv_snprintf_returns_bogus=yes])
-+	[ac_cv_snprintf_returns_bogus=yes],
-+	[ac_cv_snprintf_returns_bogus=no])
- ])
- if test $ac_cv_snprintf_returns_bogus = yes; then
- 	SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
diff --git a/recipes/git/git-native_1.6.0.4.bb b/recipes/git/git-native_1.6.0.4.bb
deleted file mode 100644
index c17ce6ec80..0000000000
--- a/recipes/git/git-native_1.6.0.4.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require git.inc
-inherit native
-DEPENDS = "openssl-native curl-native zlib-native expat-native"
-PR = "r4"
-SRC_URI += "file://autotools.patch;patch=1"
diff --git a/recipes/git/git-native_1.7.0.2.bb b/recipes/git/git-native_1.7.0.2.bb
new file mode 100644
index 0000000000..63b14cbaad
--- /dev/null
+++ b/recipes/git/git-native_1.7.0.2.bb
@@ -0,0 +1,6 @@
+require git.inc
+inherit native
+DEPENDS = "openssl-native curl-native zlib-native expat-native"
+PR = "r4"
+SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
+SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
diff --git a/recipes/git/git.inc b/recipes/git/git.inc
index 644e15931f..8275adb1a2 100644
--- a/recipes/git/git.inc
+++ b/recipes/git/git.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "The git revision control system used by the Linux kernel develope
 SECTION = "console/utils"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2"
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2;name=src"
 
 S = "${WORKDIR}/git-${PV}"
 
diff --git a/recipes/git/git_1.6.0.4.bb b/recipes/git/git_1.6.0.4.bb
deleted file mode 100644
index c37e3d0d52..0000000000
--- a/recipes/git/git_1.6.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require git.inc
-
-SRC_URI += "file://autotools.patch;patch=1 \
-            file://snprintf-returns-bogus.patch;patch=1"
-
-DEPENDS = "openssl curl zlib expat"
-RDEPENDS = "perl perl-module-file-path cpio findutils sed"
-PR = "r4"
-
-FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
new file mode 100644
index 0000000000..40052bb742
--- /dev/null
+++ b/recipes/git/git_1.7.0.2.bb
@@ -0,0 +1,13 @@
+require git.inc
+
+SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
+SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
+
+
+DEPENDS = "openssl curl zlib expat"
+RDEPENDS = "perl perl-module-file-path cpio findutils sed"
+PR = "r4"
+
+FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"