diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
| commit | d27bbcebde95f792e0660af3657878216b2590c3 (patch) | |
| tree | ebd693dbaeb22eb25643e06b80facc1e0f073e77 /core/curl/PKGBUILD | |
| parent | 68dc88e3f45d6cb33a56ca10ec02f7e990636d31 (diff) | |
| parent | 0671250710c3e7312a4693ac45ebbaacf471d1dc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/curl/PKGBUILD
core/lvm2/PKGBUILD
core/openvpn/PKGBUILD
extra/diffstat/PKGBUILD
extra/libxcb/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xvinfo/PKGBUILD
Diffstat (limited to 'core/curl/PKGBUILD')
| -rw-r--r-- | core/curl/PKGBUILD | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 97ee15a2c..87f4208bd 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177786 2013-02-08 18:18:03Z dreisner $ +# $Id: PKGBUILD 177958 2013-02-12 13:57:28Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ pkgname=curl pkgver=7.29.0 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" @@ -15,9 +15,11 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch curlbuild.h) md5sums=('4f57d3b4a3963038bd5e04dbff385390' '6283fbb36933cf8720acc34c43169f1d' + '5bfd1899e8b19cfdd78774f6337f8b47' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') @@ -35,6 +37,8 @@ build() { # We have the same CFLAGS as Arch, this should be fixed upstream. sed -i 's/xc_bad_var_cflags=yes/xc_bad_var_cflags=no/' configure + patch -Np1 <"$srcdir/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch" + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ |