From d758a620acda80de8e525f7c805b11ca3bedfac5 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 18 Jun 2018 18:45:39 -0500
Subject: system/curl: [PD] [sec] bump to 7.60.0, maintainer, modernise

---
 system/curl/APKBUILD | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'system/curl')

diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD
index fd20e55dd..08e8007a5 100644
--- a/system/curl/APKBUILD
+++ b/system/curl/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Elizabeth Myers <elizabeth@adelielinux.org>
 pkgname=curl
-pkgver=7.56.1
+pkgver=7.60.0
 pkgrel=0
 pkgdesc="An URL retrival utility and library"
 url="http://curl.haxx.se"
@@ -18,6 +18,17 @@ source="http://curl.haxx.se/download/$pkgname-$pkgver.tar.bz2
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl"
 
 # secfixes:
+#   7.60.0-r0:
+#     - CVE-2017-8816
+#     - CVE-2017-8817
+#     - CVE-2017-8818
+#     - CVE-2018-1000005
+#     - CVE-2018-1000007
+#     - CVE-2018-1000120
+#     - CVE-2018-1000121
+#     - CVE-2018-1000122
+#     - CVE-2018-1000300
+#     - CVE-2018-1000301
 #   7.56.1-r0:
 #     - CVE-2017-1000257
 #   7.55.0-r0:
@@ -56,8 +67,6 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl"
 #     - CVE-2014-0138
 #     - CVE-2014-0139
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 build() {
 	cd "$builddir"
 	./configure \
@@ -69,9 +78,8 @@ build() {
 		--without-libidn \
 		--without-libidn2 \
 		--disable-ldap \
-		--with-pic \
-		|| return 1
-	make || return 1
+		--with-pic
+	make
 }
 
 check() {
@@ -80,8 +88,8 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" \
-		-C "$builddir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 libcurl() {
@@ -90,4 +98,4 @@ libcurl() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-sha512sums="f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68  curl-7.56.1.tar.bz2"
+sha512sums="c7566bbe7289cd75d34a65b457905d54b5d07543b9fed5a762c889eb09114ad66de62c3edafd1973e87bc8e303a434e77b4e40eea1718801e79ae9256531abe9  curl-7.60.0.tar.bz2"
-- 
cgit v1.2.3-60-g2f50