network/libressl: Add --with-openssldir.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 47 insertions, 36 deletions

diff --git a/network/libressl/README b/network/libressl/README
index 97e2951744..e2ef33ecf2 100644
--- a/network/libressl/README
+++ b/network/libressl/README
@@ -2,13 +2,13 @@ LibreSSL is a fork of OpenSSL 1.0.1g developed by the OpenBSD project.
 Our goal is to modernize the codebase, improve security, and apply best
 practice development processes from OpenBSD.
 
-The binaries are symlinked as libre-openssl, libre-ocspcheck, and
-nc-tls.
+The binaries are installed as libressl-openssl, libressl-ocspcheck, and
+libressl-nc.
 
-*********************************************************************
+************************************************************************
 NOTE! This contains libtls so the standalone libtls package should be
 removed before building and installing libressl.
-*********************************************************************
+************************************************************************
 
 Compatibility with OpenSSL:
 
@@ -54,11 +54,22 @@ be sent to the core team at libressl-security@openbsd.org.
 
 OPTIONS:
 
-By default a minimal set of man pages are installed.  To install them
-all, use:
+By default a minimal set of man pages are installed:
+
+/usr/man/man1/libressl-nc
+/usr/man/man1/libressl-openssl
+/usr/man/man8/libressl-ocspcheck
+
+To install them all, use:
 
 MANPAGES=yes ./libressl.SlackBuild
 
-The man path will need adjusting:
+========================================================================
+
+MAINTAINER NOTES
+
+NOTE: PKG_CONFIG_PATH will likely need setting in your build scripts:
+
+PKG_CONFIG_PATH=/usr/lib$LIBDIRSUFFIX/libressl/pkgconfig:$PKG_CONFIG_PATH
 
-export MANPATH=/opt/libressl/man:$MANPATH
+========================================================================
diff --git a/network/libressl/libressl.SlackBuild b/network/libressl/libressl.SlackBuild
index 6242e41b1e..4fb27ddd6a 100644
--- a/network/libressl/libressl.SlackBuild
+++ b/network/libressl/libressl.SlackBuild
@@ -4,10 +4,20 @@
 #
 # WTFPL licence
 
+# BUILD 2: Thanks to Naglfar:
+#
+#    --with-openssldir=/etc/$PRGNAM \
+#
+# NOTE: PKG_CONFIG_PATH will likely need setting in your build scripts:
+#
+# PKG_CONFIG_PATH=/usr/lib$LIBDIRSUFFIX/libressl/pkgconfig:$PKG_CONFIG_PATH \
+# ./configure \
+#   ...
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libressl
-VERSION=${VERSION:-3.7.0}
+VERSION=${VERSION:-3.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -55,46 +65,39 @@ chown -R root:root .
 find . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + \
  -o \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+# Don't install man page symlinks
+sed -i '/ln -sf.*\.3"$/d' man/Makefile.in
+
 if [ "${MANPAGES:-no}" = no ]; then
   sed -i '/man\/Makefile/d' configure.ac
   autoreconf -f
   sed -i "s, man , ,g; s, install-man , ,g" Makefile.in
 fi
 
-PREFIX=/opt/$PRGNAM
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --enable-nc \
   --disable-tests \
   --disable-static \
-  --prefix=$PREFIX \
-  --libdir=$PREFIX/lib${LIBDIRSUFFIX} \
-  --sysconfdir=$PREFIX/etc \
-  --mandir=$PREFIX/man \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/$PRGNAM \
+  --includedir=/usr/include/$PRGNAM \
+  --with-openssldir=/etc/$PRGNAM \
+  --program-prefix "$PRGNAM-" \
+  --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-rm -f $PKG$PREFIX/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin ; ln -sf ../..$PREFIX/bin/nc nc-tls )
-( cd $PKG/usr/bin ; ln -sf ../..$PREFIX/bin/openssl libre-openssl )
-( cd $PKG/usr/bin ; ln -sf ../..$PREFIX/bin/ocspcheck libre-ocspcheck )
-
-mv $PKG$PREFIX/man/man1/nc.1 $PKG$PREFIX/man/man1/nc-tls.1
-mv $PKG$PREFIX/man/man1/openssl.1 $PKG$PREFIX/man/man1/libre-openssl.1
-mv $PKG$PREFIX/man/man8/ocspcheck.8 $PKG$PREFIX/man/man8/libre-ocspcheck.8
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/*.la
 
-find $PKG$PREFIX/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG$PREFIX/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/etc/ld.so.conf.d/
-echo $PREFIX/lib${LIBDIRSUFFIX} > $PKG/etc/ld.so.conf.d/$PRGNAM.conf
+echo /usr/lib${LIBDIRSUFFIX}/$PRGNAM > $PKG/etc/ld.so.conf.d/$PRGNAM.conf
 
 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
@@ -114,7 +117,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-find . -type l \
-  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
-  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/libressl/libressl.info b/network/libressl/libressl.info
index 2c28fb82f6..ca19db9fe0 100644
--- a/network/libressl/libressl.info
+++ b/network/libressl/libressl.info
@@ -1,10 +1,10 @@
 PRGNAM="libressl"
-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 \
-          https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.0-relnotes.txt"
-MD5SUM="302a11ca828332fae7bcacedf468a52e \
-        3fb3c277d83909dc90163b78b7f39400"
+DOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.1.tar.gz \
+          https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.1-relnotes.txt"
+MD5SUM="133f11e478f46528414245dccb6355f2 \
+        0b1e4784b5c3b2672c9e7432e11d1fa3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""