From 62f75c0a4e3cb8292cc39d62d6ac8a17f0f40ef9 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 24 Mar 2020 05:08:25 +0000
Subject: Tue Mar 24 05:08:25 UTC 2020

n/curl-7.69.1-x86_64-3.txz:  Rebuilt.
  Removed --with-ca-bundle=/usr/share/curl/ca-bundle.crt and
  added --without-ca-bundle. Thanks to drgibbon and Willy Sudiarto Raharjo.
---
 source/n/curl/curl.SlackBuild | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'source/n/curl/curl.SlackBuild')

diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index 35708dc7..32f1ef2b 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=curl
 VERSION=${VERSION:-$(echo curl-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -85,10 +85,11 @@ CFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --with-ca-bundle=/usr/share/curl/ca-bundle.crt \
   --with-libssh2 \
   --with-gssapi \
   --enable-static=no \
+  --without-ca-bundle \
+  --with-ca-path=/etc/ssl/certs \
   $SSLOPT || exit 1
 
 make $NUMJOBS || make || exit 1
@@ -106,15 +107,6 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
   make install-man3 DESTDIR=$PKG
 )
 
-mkdir -p $PKG/usr/share/curl
-cp -a $CWD/cacert.pem.bz2 $PKG/usr/share/curl
-( cd $PKG/usr/share/curl
-  bzip2 -d cacert.pem.bz2
-  mv cacert.pem ca-bundle.crt
-  chown root:root ca-bundle.crt
-  chmod 644 ca-bundle.crt
-)
-
 # We don't ship the related perl script (yet):
 rm -f $PKG/usr/man/man1/mk-ca-bundle.1
 
-- 
cgit v1.2.3