[arch-commits] Commit in curl/trunk (PKGBUILD)

[Dave Reisner]

    Date: Sunday, September 25, 2011 @ 10:51:24
  Author: dreisner
Revision: 138497

upgpkg: curl 7.22.0-2

PKGBUILD cleanup, use curl's own ca-bundle

Modified:
  curl/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-25 14:10:20 UTC (rev 138496)
+++ PKGBUILD	2011-09-25 14:51:24 UTC (rev 138497)
@@ -7,12 +7,13 @@
 
 pkgname=curl
 pkgver=7.22.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
 license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
+depends=('libssh2' 'openssl' 'zlib')
+makedepends=('perl-libwww')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
         curlbuild.h)
@@ -20,11 +21,11 @@
          '1b061c348b63ea3e90c3f2c3af6a08d6'
          '751bd433ede935c8fae727377625a8ae')
 
-
-case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in
+ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
+case $ptrsize in
   8) _curlbuild=curlbuild-64.h ;;
   4) _curlbuild=curlbuild-32.h ;;
-  *) error "unsupported architecture: %s" "$CARCH"
+  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
     exit 1
     ;;
 esac
@@ -33,19 +34,21 @@
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
-      --with-random=/dev/urandom \
       --prefix=/usr \
       --mandir=/usr/share/man \
       --disable-dependency-tracking \
+      --disable-ldap \
+      --disable-ldaps \
       --enable-ipv6 \
-      --disable-ldaps \
-      --disable-ldap \
       --enable-manual \
       --enable-versioned-symbols \
-      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+      --enable-threaded-resolver \
       --without-libidn \
-      --enable-threaded-resolver
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt
   make
+
+  perl lib/mk-ca-bundle.pl
 }
 
 package() {
@@ -53,7 +56,13 @@
 
   make DESTDIR="$pkgdir" install
 
+  # license
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  # cert bundle
+  install -Dm644 ca-bundle.crt "$pkgdir/etc/ssl/certs/ca-bundle.crt"
+
+  # devel
   install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
   mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
   install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"