summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core-testing/curl/ChangeLog5
-rw-r--r--abs/core-testing/curl/PKGBUILD55
-rw-r--r--abs/core-testing/curl/m4-typo.patch13
3 files changed, 48 insertions, 25 deletions
diff --git a/abs/core-testing/curl/ChangeLog b/abs/core-testing/curl/ChangeLog
index 02635bf..abcd7af 100644
--- a/abs/core-testing/curl/ChangeLog
+++ b/abs/core-testing/curl/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-09 Eric Belanger <eric@archlinux.org>
+
+ * curl 7.20.0-1
+ * Upstream update
+
2009-11-04 Eric Belanger <eric@archlinux.org>
* curl 7.19.7-1
diff --git a/abs/core-testing/curl/PKGBUILD b/abs/core-testing/curl/PKGBUILD
index bee1fcb..ba286a5 100644
--- a/abs/core-testing/curl/PKGBUILD
+++ b/abs/core-testing/curl/PKGBUILD
@@ -1,39 +1,44 @@
-# $Id: PKGBUILD 58157 2009-11-05 05:13:33Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 87558 2010-08-16 20:27:57Z dgriffiths $
+# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=curl
-pkgver=7.19.7
+pkgver=7.21.1
pkgrel=1
pkgdesc="An URL retrival utility and library"
arch=('i686' 'x86_64')
url="http://curl.haxx.se"
license=('MIT')
-depends=('zlib' 'openssl>=0.9.8b' 'bash' 'ca-certificates')
+depends=('zlib' 'openssl' 'bash' 'ca-certificates')
options=('!libtool')
-source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('79a8fbb2eed5464b97bdf94bee109380')
-sha1sums=('c306ebf0f65fb90df3c9c9a12fb04fb77cc29e2c')
+source=("http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('eafde5b933bce1c1dca82d1054c8d967')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${srcdir}/${pkgname}-${pkgver}
- # Thanks Debian and Gentoo =)
- ./configure \
- --with-random=/dev/urandom \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --enable-ipv6 \
- --disable-ldaps \
- --disable-ldap \
- --enable-manual \
- --enable-versioned-symbols \
- --with-ca-path=/etc/ssl/certs \
- --without-libidn || return 1
+ ./configure \
+ --with-random=/dev/urandom \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-dependency-tracking \
+ --enable-ipv6 \
+ --disable-ldaps \
+ --disable-ldap \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --with-ca-path=/etc/ssl/certs \
+ --without-libidn || return 1
+ make || return 1
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
- install -D -m644 docs/libcurl/libcurl.m4 "${pkgdir}/usr/share/aclocal/libcurl.m4" || return 1
+ make DESTDIR=${pkgdir} install || return 1
+ install -Dm644 COPYING \
+ ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
+ install -Dm644 docs/libcurl/libcurl.m4 \
+ ${pkgdir}/usr/share/aclocal/libcurl.m4 || return 1
}
diff --git a/abs/core-testing/curl/m4-typo.patch b/abs/core-testing/curl/m4-typo.patch
new file mode 100644
index 0000000..2e46dff
--- /dev/null
+++ b/abs/core-testing/curl/m4-typo.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libcurl.m4
+index ce8e476..50dc20d 100644
+--- a/docs/libcurl/libcurl.m4
++++ b/docs/libcurl/libcurl.m4
+@@ -198,7 +198,7 @@ x=CURLOPT_VERBOSE;
+
+ # We don't have --protocols, so just assume that all
+ # protocols are available
+- _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP
++ _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
+
+ if test x$libcurl_feature_SSL = xyes ; then
+ _libcurl_protocols="$_libcurl_protocols HTTPS"