diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-26 20:30:00 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-26 20:30:00 +0200 |
| commit | a9a4a92d8375d35e09a3cf9d50921d8839d7c79a (patch) | |
| tree | 1217e2a328639b657e0093610164110a3f65a7d5 /core/curl/PKGBUILD | |
| parent | 61594aa2e82bf07473dce9134553b757b618d9ae (diff) | |
| parent | cf507a0dbf5ee8258e49256049b420ac8e191387 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/xf86-video-siliconmotion/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
multilib-testing/libtool-multilib/PKGBUILD
testing/gcc/PKGBUILD
testing/gcc/gcc_pure64.patch
testing/glibc/PKGBUILD
testing/glibc/glibc-2.15-vfprintf-nargs.patch
testing/krb5/PKGBUILD
testing/libtool/PKGBUILD
Diffstat (limited to 'core/curl/PKGBUILD')
| -rw-r--r-- | core/curl/PKGBUILD | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 2d51b93c4..bf321780a 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148373 2012-01-30 19:14:16Z ibiru $ +# $Id: PKGBUILD 154258 2012-03-25 02:41:53Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.24.0 -pkgrel=2 +pkgver=7.25.0 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" @@ -15,11 +15,9 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - 0001-include-headers-for-tcp-keepalives.patch curlbuild.h) -md5sums=('b93420f80a2baaa61a0f45214eddc2ba' - '710242df6bc318d16eea611e7d1b1410' - '84833972c2ff36abb2bfdd4ac065c2e5' +md5sums=('a56cbe2778b09769f8a5ba17d8f4d92a' + '0e0fd2da19bde6f7be687667e2fac02f' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') @@ -34,8 +32,6 @@ esac build() { cd "$pkgname-$pkgver" - patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ |