diff options
| -rw-r--r-- | main/git/APKBUILD | 12 | ||||
| -rw-r--r-- | main/git/git-do-not-dump-core-when-iconv-fails.patch | 43 |
2 files changed, 4 insertions, 51 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD index f8d9e8bb0..0e2b7e1ef 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.1 -pkgrel=2 +pkgver=1.7.1.1 +pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -10,7 +10,6 @@ subpackages="$pkgname-doc $pkgname-perl" makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev" source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2 bb-tar.patch - git-do-not-dump-core-when-iconv-fails.patch " _makeopts="NO_ICONV=YesPlease @@ -21,8 +20,6 @@ _makeopts="NO_ICONV=YesPlease build() { cd "$srcdir"/$pkgname-$pkgver patch -p1 -i "$srcdir"/bb-tar.patch || return 1 - patch -p1 -i "$srcdir"/git-do-not-dump-core-when-iconv-fails.patch \ - || return 1 make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1 } @@ -45,6 +42,5 @@ perl() { } -md5sums="3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 -e63a201556c4f089de790805c09a2e5b bb-tar.patch -7c660517316261b383a094ef03aad0aa git-do-not-dump-core-when-iconv-fails.patch" +md5sums="1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 +e63a201556c4f089de790805c09a2e5b bb-tar.patch" diff --git a/main/git/git-do-not-dump-core-when-iconv-fails.patch b/main/git/git-do-not-dump-core-when-iconv-fails.patch deleted file mode 100644 index b338ee480..000000000 --- a/main/git/git-do-not-dump-core-when-iconv-fails.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 43acff34b902c38808ac0f326090f2516250e1f0 -Author: Jonathan Nieder <jrnieder@gmail.com> -Date: Sat May 8 18:17:29 2010 -0500 - - cherry-pick: do not dump core when iconv fails - - When cherry-picking, usually the new and old commit encodings are both - UTF-8. Most old iconv implementations do not support this trivial - conversion, so on old platforms, out->message remains NULL, and later - attempts to read it segfault. - - Fix this by noticing the input and output encodings match and skipping - the iconv step, like the other reencode_string() call sites already do. - Also stop segfaulting on other iconv failures: if iconv fails for some - other reason, the best we can do is to pass the old message through. - - This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert: - clarify label on conflict hunks, 2010-03-20). - - Reported-by: Andreas Krey <a.krey@gmx.de> - Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> - Signed-off-by: Junio C Hamano <gitster@pobox.com> - -diff --git a/builtin/revert.c b/builtin/revert.c -index 778a56e..7d68ef7 100644 ---- a/builtin/revert.c -+++ b/builtin/revert.c -@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out) - encoding = "UTF-8"; - if (!git_commit_encoding) - git_commit_encoding = "UTF-8"; -- if ((out->reencoded_message = reencode_string(raw_message, -- git_commit_encoding, encoding))) -+ -+ out->reencoded_message = NULL; -+ out->message = raw_message; -+ if (strcmp(encoding, git_commit_encoding)) -+ out->reencoded_message = reencode_string(raw_message, -+ git_commit_encoding, encoding); -+ if (out->reencoded_message) - out->message = out->reencoded_message; - - abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); |