From 3ae54ba416a5222a99948a4a85bc4f9d4ad10989 Mon Sep 17 00:00:00 2001 From: Reza Talebi Date: Sat, 16 Nov 2024 02:08:29 +0330 Subject: [PATCH] network/nordvpn: Fixed compatibility issues Signed-off-by: Reza Talebi --- network/nordvpn/doinst.sh | 11 +++++++++++ network/nordvpn/nordvpn.SlackBuild | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/network/nordvpn/doinst.sh b/network/nordvpn/doinst.sh index 51d3c3bd154..3416ffe632f 100644 --- a/network/nordvpn/doinst.sh +++ b/network/nordvpn/doinst.sh @@ -1,3 +1,14 @@ +# Patched by Peter Christy + +# update configuration and shared library cache for linker to find .so files +echo "/usr/lib64/nordvpn" > /etc/ld.so.conf.d/nordvpn.conf +# NOTE: We found some really strange behavior with `ldconfig` cache refresh here. +# On .deb systems, using just `ldconfig` causes the nordvpnd daemon to fail on +# the first start with error that .so are missing. On restart, it's working again. +# Adding ANY flag to `ldconfig` (even the one we added on our own which does +# literally nothing) fixes the issue. +ldconfig -v > /dev/null 2>&1 + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/network/nordvpn/nordvpn.SlackBuild b/network/nordvpn/nordvpn.SlackBuild index 94bcd4fabe9..8286388af83 100644 --- a/network/nordvpn/nordvpn.SlackBuild +++ b/network/nordvpn/nordvpn.SlackBuild @@ -23,6 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Pouria Rezaei +# Patched by Peter Christy + cd $(dirname $0) ; CWD=$(pwd) @@ -30,7 +32,7 @@ PRGNAM=nordvpn VERSION=${VERSION:-3.19.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} +PKGTYPE=${PKGTYPE:-txz} # Select nordvpn's default group NORD_GROUP=${NORD_GROUP:-nordvpn} @@ -88,6 +90,12 @@ mkdir -p $PRGNAM-$VERSION cd $PKG ar p $CWD/${PRGNAM}_${VERSION}_${DEBARCH}.deb data.tar.gz | tar zxv +# nordvpn-3.19.x appears to need additional libraries: +mkdir -p usr/lib64/nordvpn +cp usr/lib/nordvpn/*.so usr/lib64/nordvpn/ +# Remove libsqlite3 so as not to interfere with Slackware's native version: +rm usr/lib64/nordvpn/libsqlite3.so + rm -fR etc usr/lib # Move man where the man likes