aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/git
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-03-08 21:56:06 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-03-08 21:56:06 +0800
commitfc4226e83fe8d029ad5602a2b79df8e500f8d34f (patch)
tree5ce41d31a6c7d8bb38661aa58d1d8e41f355c6ff /recipes/git
parentb0a786a1591c4dad10aa5429dec2a074e9fa5d6d (diff)
downloadopenembedded-fc4226e83fe8d029ad5602a2b79df8e500f8d34f.tar.gz
openembedded-fc4226e83fe8d029ad5602a2b79df8e500f8d34f.tar.bz2
openembedded-fc4226e83fe8d029ad5602a2b79df8e500f8d34f.zip
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
Diffstat (limited to 'recipes/git')
-rw-r--r--recipes/git/files/autotools.patch26
-rw-r--r--recipes/git/files/snprintf-returns-bogus.patch12
-rw-r--r--recipes/git/git-native_1.6.0.4.bb5
-rw-r--r--recipes/git/git-native_1.7.0.2.bb6
-rw-r--r--recipes/git/git.inc2
-rw-r--r--recipes/git/git_1.6.0.4.bb10
-rw-r--r--recipes/git/git_1.7.0.2.bb13
7 files changed, 20 insertions, 54 deletions
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"