From 90e1bb9c45d2a94d710acea9fd6ddec68f3e08f1 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 24 Dec 2021 14:00:32 -0500 Subject: [PATCH] development/hexinator: Fix -current build. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- development/hexinator/hexinator.SlackBuild | 30 ++++++++++++++++++++-- development/hexinator/hexinator.info | 12 ++++++--- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/development/hexinator/hexinator.SlackBuild b/development/hexinator/hexinator.SlackBuild index 012a452a4b..48b3e18729 100644 --- a/development/hexinator/hexinator.SlackBuild +++ b/development/hexinator/hexinator.SlackBuild @@ -6,8 +6,8 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20211224 bkw: BUILD=2, fix for -current (add old openssl lib). # 20200326 bkw: update for v1.12 for 64-bit, stay at 1.10 for 32-bit. - # 20200317 bkw: update for v1.10, switched from RPM to .deb. Yes, there # is a v1.11 available, but there are good reasons for not packaging it, # from our POV: @@ -20,7 +20,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hexinator VERSION=${VERSION:-1.12} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,6 +82,28 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# 20211224 bkw: upstream's QtNetwork library was built with +# openssl-1.0.x. It won't work with openssl-1.1.x, and hexinator +# won't work with Slackware's qt5. Since PV dropped openssl10-solibs, +# we have to include the shared lib in this package. Before you +# start freaking out about how insecure and unmaintained this old +# openssl is, remember that it's *only* used by hexinator (lives in +# /opt/hexinator), and that hexinator only uses it to talk to its own +# vendor's server. So long as you trust the vendor, it's OK. And if +# you don't, you wouldn't run their precompiled binary anyway, right? + +SSL10VER="${SSL10VER:-1.0.2u}" +SSL10BLD="${SSL10BLD:-2}" +SSL10ARCH="x86_64" +[ "$ARCH" != "x86_64" ] && SSL10ARCH=i586 + +mkdir tmp +cd tmp + tar xvf $CWD/openssl10-solibs-$SSL10VER-$SSL10ARCH-$SSL10BLD.txz + mv ./lib*/lib{ssl,crypto}*.so.* $PKG/opt/$PRGNAM/lib +cd - +rm -rf tmp + # The hexinator binary was built with rpath support, so it can find its # own libraries. The libs need some attention before hexinator can find # them (presumably dpkg would automagically do this when the package gets @@ -89,8 +111,12 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # libs. We *don't* want it using any other qt5 libs that may happen to # exist (like the ones in /usr/lib64 from the qt5 SlackBuild). The # ldconfig step here prevents that. + chmod 755 $PKG/opt/$PRGNAM/lib/* ldconfig -n -N $PKG/opt/$PRGNAM/lib +for i in ssl crypto; do + ln -s lib$i.so.1 $PKG/opt/$PRGNAM/lib/lib$i.so +done # Convenience symlink, for us command line freaks. mkdir -p $PKG/usr/bin diff --git a/development/hexinator/hexinator.info b/development/hexinator/hexinator.info index 89be995081..ef4b42554d 100644 --- a/development/hexinator/hexinator.info +++ b/development/hexinator/hexinator.info @@ -1,10 +1,14 @@ PRGNAM="hexinator" VERSION="1.12" HOMEPAGE="https://hexinator.com/" -DOWNLOAD="https://hexinator.com/downloads/dists/synalysis/non-free/binary-i386/hexinator-1.10_i386.deb" -MD5SUM="7d056fcd3f45519873adf453caa9a5dc" -DOWNLOAD_x86_64="https://hexinator.com/downloads/dists/synalysis/non-free/binary-amd64/hexinator-1.12_amd64.deb" -MD5SUM_x86_64="1dd4bb1ac5a312c0fe86cdc2d946130b" +DOWNLOAD="https://hexinator.com/downloads/dists/synalysis/non-free/binary-i386/hexinator-1.10_i386.deb \ + https://slackware.uk/cumulative/slackware-current/slackware/a/openssl10-solibs-1.0.2u-i586-2.txz" +MD5SUM="7d056fcd3f45519873adf453caa9a5dc \ + 24daa7235c1ba79a718a12734d5f4b47" +DOWNLOAD_x86_64="https://hexinator.com/downloads/dists/synalysis/non-free/binary-amd64/hexinator-1.12_amd64.deb \ + https://slackware.uk/cumulative/slackware64-current/slackware64/a/openssl10-solibs-1.0.2u-x86_64-2.txz" +MD5SUM_x86_64="1dd4bb1ac5a312c0fe86cdc2d946130b \ + 4f46ed0bada6b941153c22dad3634c64" REQUIRES="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com"