From b02531a8bf977166f3c6506ef61fea200386f71e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 23 Feb 2018 16:57:00 +0000
Subject: curl: update to 7.58

---
 abs/core/curl/PKGBUILD    | 38 ++++++++++++--------------------------
 abs/core/curl/curlbuild.h |  9 ---------
 2 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100644 abs/core/curl/curlbuild.h

diff --git a/abs/core/curl/PKGBUILD b/abs/core/curl/PKGBUILD
index 212a08a..ca75ffc 100644
--- a/abs/core/curl/PKGBUILD
+++ b/abs/core/curl/PKGBUILD
@@ -6,21 +6,20 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=curl
-pkgver=7.47.1
-pkgrel=2
+pkgver=7.58.0
+pkgrel=1
 pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
+arch=('x86_64')
+url="https://curl.haxx.se"
 license=('MIT')
-depends=('ca-certificates' 'krb5' 'libidn' 'libssh2' 'openssl' 'zlib')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2')
 provides=('libcurl.so')
 options=('strip' 'debug')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        curlbuild.h)
-md5sums=('3f9d1be7bf33ca4b8c8602820525302b'
-         'SKIP'
-         '751bd433ede935c8fae727377625a8ae')
-validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc})
+sha512sums=('7b12b79107558bb266672d6e128615fe5a8149c37f4ae540197e3298f5d312beb2d78fbb23e3ea84ea7afc41549898a1e5cd38509f0388b11707b48d5efb8ca3'
+            'SKIP')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+              '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
 build() {
   cd "$pkgname-$pkgver"
@@ -30,12 +29,11 @@ build() {
       --mandir=/usr/share/man \
       --disable-ldap \
       --disable-ldaps \
+      --disable-manual \
       --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
 
@@ -46,20 +44,8 @@ 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
+  make DESTDIR="$pkgdir" install -C scripts
 
   # 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"
 }
diff --git a/abs/core/curl/curlbuild.h b/abs/core/curl/curlbuild.h
deleted file mode 100644
index b488626..0000000
--- a/abs/core/curl/curlbuild.h
+++ /dev/null
@@ -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
-- 
cgit v0.12

