Date: Tuesday, June 30, 2015 @ 16:38:16 Author: dreisner Revision: 241437
archrelease: copy trunk to testing-i686, testing-x86_64 Added: curl/repos/testing-i686/ curl/repos/testing-i686/PKGBUILD (from rev 241436, curl/trunk/PKGBUILD) curl/repos/testing-i686/curlbuild.h (from rev 241436, curl/trunk/curlbuild.h) curl/repos/testing-x86_64/ curl/repos/testing-x86_64/PKGBUILD (from rev 241436, curl/trunk/PKGBUILD) curl/repos/testing-x86_64/curlbuild.h (from rev 241436, curl/trunk/curlbuild.h) Deleted: curl/repos/testing-i686/PKGBUILD curl/repos/testing-i686/curlbuild.h curl/repos/testing-x86_64/PKGBUILD curl/repos/testing-x86_64/curlbuild.h ----------------------------+ /PKGBUILD | 140 +++++++++++++++++++++++++++++++++++++++++++ /curlbuild.h | 18 +++++ testing-i686/PKGBUILD | 65 ------------------- testing-i686/curlbuild.h | 9 -- testing-x86_64/PKGBUILD | 65 ------------------- testing-x86_64/curlbuild.h | 9 -- 6 files changed, 158 insertions(+), 148 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2015-06-21 21:33:13 UTC (rev 241170) +++ testing-i686/PKGBUILD 2015-06-30 14:38:16 UTC (rev 241437) @@ -1,65 +0,0 @@ -# $Id$ -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Eric Belanger <e...@archlinux.org> -# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=curl -pkgver=7.43.0 -pkgrel=1 -pkgdesc="An URL retrieval utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('ca-certificates' 'krb5' 'libssh2' 'libidn' 'openssl' 'zlib') -provides=('libcurl.so') -options=('strip' 'debug') -source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h) -md5sums=('3037f0b6ce03d434618e9db5506ae6be' - 'SKIP' - '751bd433ede935c8fae727377625a8ae') -validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg - -build() { - cd "$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-ldap \ - --disable-ldaps \ - --enable-ipv6 \ - --enable-manual \ - --enable-versioned-symbols \ - --enable-threaded-resolver \ - --with-gssapi \ - --with-libidn \ - --with-random=/dev/urandom \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') - case $ptrsize in - 8) _curlbuild=curlbuild-64.h ;; - 4) _curlbuild=curlbuild-32.h ;; - *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" - exit 1 - ;; - esac - - # license - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - # devel - mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" - install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" -} Copied: curl/repos/testing-i686/PKGBUILD (from rev 241436, curl/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-06-30 14:38:16 UTC (rev 241437) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=curl +pkgver=7.43.0 +pkgrel=2 +pkgdesc="An URL retrieval utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib') +provides=('libcurl.so') +options=('strip' 'debug') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('3037f0b6ce03d434618e9db5506ae6be' + 'SKIP' + '751bd433ede935c8fae727377625a8ae') +validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg + +build() { + cd "$pkgname-$pkgver" + + # Consider re-adding libidn support once upstream security issues are + # resolved. As of version 1.30, it does not handle bad utf-8 properly. + # http://curl.haxx.se/mail/lib-2015-06/0143.html + # https://lists.gnu.org/archive/html/bug-wget/2015-06/msg00002.html + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --with-gssapi \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') + case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; + esac + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} Deleted: testing-i686/curlbuild.h =================================================================== --- testing-i686/curlbuild.h 2015-06-21 21:33:13 UTC (rev 241170) +++ testing-i686/curlbuild.h 2015-06-30 14:38:16 UTC (rev 241437) @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "curlbuild-32.h" -#elif __WORDSIZE == 64 -#include "curlbuild-64.h" -#else -#error "Unknown word size" -#endif Copied: curl/repos/testing-i686/curlbuild.h (from rev 241436, curl/trunk/curlbuild.h) =================================================================== --- testing-i686/curlbuild.h (rev 0) +++ testing-i686/curlbuild.h 2015-06-30 14:38:16 UTC (rev 241437) @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2015-06-21 21:33:13 UTC (rev 241170) +++ testing-x86_64/PKGBUILD 2015-06-30 14:38:16 UTC (rev 241437) @@ -1,65 +0,0 @@ -# $Id$ -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Eric Belanger <e...@archlinux.org> -# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=curl -pkgver=7.43.0 -pkgrel=1 -pkgdesc="An URL retrieval utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('ca-certificates' 'krb5' 'libssh2' 'libidn' 'openssl' 'zlib') -provides=('libcurl.so') -options=('strip' 'debug') -source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h) -md5sums=('3037f0b6ce03d434618e9db5506ae6be' - 'SKIP' - '751bd433ede935c8fae727377625a8ae') -validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg - -build() { - cd "$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-ldap \ - --disable-ldaps \ - --enable-ipv6 \ - --enable-manual \ - --enable-versioned-symbols \ - --enable-threaded-resolver \ - --with-gssapi \ - --with-libidn \ - --with-random=/dev/urandom \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') - case $ptrsize in - 8) _curlbuild=curlbuild-64.h ;; - 4) _curlbuild=curlbuild-32.h ;; - *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" - exit 1 - ;; - esac - - # license - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - # devel - mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" - install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" -} Copied: curl/repos/testing-x86_64/PKGBUILD (from rev 241436, curl/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-06-30 14:38:16 UTC (rev 241437) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=curl +pkgver=7.43.0 +pkgrel=2 +pkgdesc="An URL retrieval utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib') +provides=('libcurl.so') +options=('strip' 'debug') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('3037f0b6ce03d434618e9db5506ae6be' + 'SKIP' + '751bd433ede935c8fae727377625a8ae') +validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg + +build() { + cd "$pkgname-$pkgver" + + # Consider re-adding libidn support once upstream security issues are + # resolved. As of version 1.30, it does not handle bad utf-8 properly. + # http://curl.haxx.se/mail/lib-2015-06/0143.html + # https://lists.gnu.org/archive/html/bug-wget/2015-06/msg00002.html + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --with-gssapi \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') + case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; + esac + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} Deleted: testing-x86_64/curlbuild.h =================================================================== --- testing-x86_64/curlbuild.h 2015-06-21 21:33:13 UTC (rev 241170) +++ testing-x86_64/curlbuild.h 2015-06-30 14:38:16 UTC (rev 241437) @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "curlbuild-32.h" -#elif __WORDSIZE == 64 -#include "curlbuild-64.h" -#else -#error "Unknown word size" -#endif Copied: curl/repos/testing-x86_64/curlbuild.h (from rev 241436, curl/trunk/curlbuild.h) =================================================================== --- testing-x86_64/curlbuild.h (rev 0) +++ testing-x86_64/curlbuild.h 2015-06-30 14:38:16 UTC (rev 241437) @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif