aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD Woodfall <dave@slackbuilds.org>2023-03-18 21:50:07 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-03-25 10:01:47 +0700
commit1967e9aa87aefa79ac8ccec5b127c39159b55a99 (patch)
tree33c2801d428ecc4ce79c619e447ebbbfae417454
parent6d4ac662b353b9462bf07b8cd367e4e4a1ae4873 (diff)
network/libtls: Add --with-openssldir.
Signed-off-by: bedlam <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/libtls/README6
-rw-r--r--network/libtls/libtls.SlackBuild21
-rw-r--r--network/libtls/libtls.info6
3 files changed, 16 insertions, 17 deletions
diff --git a/network/libtls/README b/network/libtls/README
index b413c1d951d4f..960ec647d0f77 100644
--- a/network/libtls/README
+++ b/network/libtls/README
@@ -4,9 +4,9 @@ using the TLS socket protocol. Both clients and servers are supported.
A TLS connection object is created by tls_client(3) or tls_server(3) and
configured with tls_configure(3).
-This also includes a TLS-enabled version of netcat (nc-tls).
+This also includes a TLS-enabled version of netcat (libressl-nc).
-*******************************************************************
+************************************************************************
NOTE! The libressl package already contains libtls.
It's recommended to uninstall this before installing libressl.
-*******************************************************************
+************************************************************************
diff --git a/network/libtls/libtls.SlackBuild b/network/libtls/libtls.SlackBuild
index 0e412a5c217da..a36c2f04d4f61 100644
--- a/network/libtls/libtls.SlackBuild
+++ b/network/libtls/libtls.SlackBuild
@@ -4,11 +4,15 @@
#
# WTFPL licence 2023
+# BUILD 2: Thanks to Naglfar:
+#
+# --with-openssldir=/etc/libressl \
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=libtls
SRCNAM=libressl
-VERSION=${VERSION:-3.7.0}
+VERSION=${VERSION:-3.7.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -65,7 +69,9 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
+ --sysconfdir=/etc/libressl \
+ --with-openssldir=/etc/libressl \
+ --program-prefix "libressl-" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
@@ -73,19 +79,12 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-# don't clobber stock netcat
-mv $PKG/usr/bin/nc $PKG/usr/bin/nc-tls
-
-rm -f $PKG/usr/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-# we don't want to clobber openssl files
-rm -rf $PKG/etc
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-gzip -9 $PKG/usr/man/man1/nc.1
-mv $PKG/usr/man/man1/nc.1.gz $PKG/usr/man/man1/nc-tls.1.gz
+gzip -9 $PKG/usr/man/man1/libressl-nc.1
mkdir -p $PKG/usr/man/man3
diff --git a/network/libtls/libtls.info b/network/libtls/libtls.info
index 9c33ba88e9794..63e80c1de2c4d 100644
--- a/network/libtls/libtls.info
+++ b/network/libtls/libtls.info
@@ -1,8 +1,8 @@
PRGNAM="libtls"
-VERSION="3.7.0"
+VERSION="3.7.1"
HOMEPAGE="https://www.libressl.org"
-DOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.0.tar.gz"
-MD5SUM="302a11ca828332fae7bcacedf468a52e"
+DOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.1.tar.gz"
+MD5SUM="133f11e478f46528414245dccb6355f2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""