aboutsummaryrefslogtreecommitdiffstats
path: root/main/git
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-07-12 14:38:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-07-12 14:38:51 +0000
commite966561ed2c8f83cfbadd3a8302b9d32d344f5e6 (patch)
tree48f346837bb572dc4d6e6decb7ea3fb33b622513 /main/git
parent37df15bf2625df568de6122a9538539bf0f752d3 (diff)
downloadaports-e966561ed2c8f83cfbadd3a8302b9d32d344f5e6.tar.bz2
aports-e966561ed2c8f83cfbadd3a8302b9d32d344f5e6.tar.xz
main/git: upgrade to 1.7.11.2
Diffstat (limited to 'main/git')
-rw-r--r--main/git/APKBUILD8
-rw-r--r--main/git/uclibc-index-pack.patch14
2 files changed, 3 insertions, 19 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index e134a4966b..132071d42c 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=git
-pkgver=1.7.11.1
-pkgrel=1
+pkgver=1.7.11.2
+pkgrel=0
pkgdesc="A distributed version control system"
url="http://git.or.cz/"
arch="all"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc $pkgname-svn $pkgname-perl"
makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev"
source="http://git-core.googlecode.com/files/git-$pkgver.tar.gz
bb-tar.patch
- uclibc-index-pack.patch
git-daemon.initd
git-daemon.confd
"
@@ -73,8 +72,7 @@ svn() {
mv "$pkgdir"/usr/libexec/git-core/git-svn "$subpkgdir"/usr/libexec/git-core
}
-md5sums="2c5d85ec5b6e08986d942461debc9d6b git-1.7.11.1.tar.gz
+md5sums="91e01a22032f5d0ca2941ae7fd49d587 git-1.7.11.2.tar.gz
e63a201556c4f089de790805c09a2e5b bb-tar.patch
-8ea98a99f3eb127f66a8e99f64e60ade uclibc-index-pack.patch
3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd
2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd"
diff --git a/main/git/uclibc-index-pack.patch b/main/git/uclibc-index-pack.patch
deleted file mode 100644
index c5b7ec5cf6..0000000000
--- a/main/git/uclibc-index-pack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./builtin/index-pack.c.orig
-+++ ./builtin/index-pack.c
-@@ -39,9 +39,10 @@
- int ofs_first, ofs_last;
- };
-
--#if !defined(NO_PTHREADS) && defined(NO_PREAD)
-+#if (!defined(NO_PTHREADS) && defined(NO_PREAD)) || defined(__UCLIBC__)
- /* NO_PREAD uses compat/pread.c, which is not thread-safe. Disable threading. */
- #define NO_PTHREADS
-+
- #endif
-
- struct thread_local {