Changes in npl/overig/curl/curl.SlackBuild.orig [c5c522c:105afb5]

File:

• npl/overig/curl/curl.SlackBuild.orig (modified) (6 diffs)

npl/overig/curl/curl.SlackBuild.orig

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2016, 2017, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -21 +21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=curl
-VERSION=${VERSION:-$(echo curl-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo curl-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
@@ -36 +37 @@
 fi
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
 
-CWD=$(pwd)
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-curl
 
-# Uncomment to build a no-SSL version:
-#SSLOPT=--without-ssl
+# Set this variable to "--without-ssl" to build a no-SSL version:
+SSLOPT=${SSLOPT:-"--with-openssl"}
 
 if [ "$ARCH" = "i586" ]; then
@@ -63 +71 @@
 cd $TMP
 rm -rf curl-$VERSION
-tar xvf $CWD/curl-$VERSION.tar.bz2 || exit 1
-cd curl-$VERSION
+tar xvf $CWD/curl-$VERSION.tar.xz || exit 1
+cd curl-$VERSION || exit 1
 
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
+  -exec chmod 755 {} \+ -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+  -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
@@ -78 +86 @@
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --with-ca-bundle=/usr/share/curl/ca-bundle.crt \
+  --with-gssapi \
   --enable-static=no \
-  $SSLOPT
+  --without-ca-bundle \
+  --with-ca-path=/etc/ssl/certs \
+  $SSLOPT || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-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
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# We have always installed the man3 documentation, so we'll keep doing it
+# even though these are no longer installed by default. No || exit 1, if
+# it works, it works, and if it doesn't, we tried.
+( cd docs/libcurl
+  make install-man3 DESTDIR=$PKG
+  cd opts
+  make install-man3 DESTDIR=$PKG
 )
 
@@ -104 +117 @@
 mkdir -p $PKG/usr/doc/curl-$VERSION
 cp -a \
-  COPYING* README* \
+  COPYING* README*  \
   $PKG/usr/doc/curl-$VERSION
-( cd docs
-  rm -rf Makefile* curl-config.1 curl-config.html curl.1 curl.html libcurl
-  cp -a \
-    BUGS  FAQ FEATURES INSTALL  MANUAL README* RESOURCES THANKS TODO examples \
-    $PKG/usr/doc/curl-$VERSION )
 # Get rid of .deps cruft:
-rm -rf $PKG/usr/doc/curl-$VERSION/examples/.deps
+rm -rf $PKG/usr/doc/curl-$VERSION/examples/.deps || true
 
 # If there's a CHANGES file, installing at least part of the recent history