Update to 3.20.2-3
This commit is contained in:
5
.SRCINFO
5
.SRCINFO
@@ -1,7 +1,7 @@
|
|||||||
pkgbase = nordvpn-bin
|
pkgbase = nordvpn-bin
|
||||||
pkgdesc = NordVPN CLI tool for Linux
|
pkgdesc = NordVPN CLI tool for Linux
|
||||||
pkgver = 3.20.2
|
pkgver = 3.20.2
|
||||||
pkgrel = 2.1
|
pkgrel = 3
|
||||||
url = https://nordvpn.com/download/linux/
|
url = https://nordvpn.com/download/linux/
|
||||||
install = nordvpn-bin.install
|
install = nordvpn-bin.install
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
@@ -11,10 +11,9 @@ pkgbase = nordvpn-bin
|
|||||||
arch = armeabi
|
arch = armeabi
|
||||||
license = GPL3
|
license = GPL3
|
||||||
depends = libxml2
|
depends = libxml2
|
||||||
|
optdepends = libxml2-legacy
|
||||||
provides = nordvpn
|
provides = nordvpn
|
||||||
conflicts = openvpn-nordvpn
|
conflicts = openvpn-nordvpn
|
||||||
source = https://archive.archlinux.org/packages/l/libxml2/libxml2-2.13.8-1-x86_64.pkg.tar.zst
|
|
||||||
sha256sums = 2a1b0ab11ff213a57268d20fff183e3fd3e4ab9191aeed473de336b77bdfa6e1
|
|
||||||
source_x86_64 = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_3.20.2_amd64.deb
|
source_x86_64 = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_3.20.2_amd64.deb
|
||||||
sha256sums_x86_64 = d9e2d5af4690a4c848302ae4c8845c09a6d7735f7b189677d5597904d0fb0e2f
|
sha256sums_x86_64 = d9e2d5af4690a4c848302ae4c8845c09a6d7735f7b189677d5597904d0fb0e2f
|
||||||
source_i686 = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_3.20.2_i386.deb
|
source_i686 = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_3.20.2_i386.deb
|
||||||
|
|||||||
22
PKGBUILD
22
PKGBUILD
@@ -5,18 +5,16 @@
|
|||||||
|
|
||||||
pkgname=nordvpn-bin
|
pkgname=nordvpn-bin
|
||||||
pkgver=3.20.2
|
pkgver=3.20.2
|
||||||
pkgrel=2.1
|
pkgrel=3
|
||||||
pkgdesc="NordVPN CLI tool for Linux"
|
pkgdesc="NordVPN CLI tool for Linux"
|
||||||
arch=('x86_64' 'i686' 'armv7h' 'aarch64' 'armeabi')
|
arch=('x86_64' 'i686' 'armv7h' 'aarch64' 'armeabi')
|
||||||
url="https://nordvpn.com/download/linux/"
|
url="https://nordvpn.com/download/linux/"
|
||||||
license=('GPL3')
|
license=('GPL3')
|
||||||
depends=('libxml2')
|
depends=('libxml2')
|
||||||
|
optdepends=('libxml2-legacy')
|
||||||
provides=('nordvpn')
|
provides=('nordvpn')
|
||||||
conflicts=('openvpn-nordvpn')
|
conflicts=('openvpn-nordvpn')
|
||||||
install=nordvpn-bin.install
|
install=nordvpn-bin.install
|
||||||
source=("https://archive.archlinux.org/packages/l/libxml2/libxml2-2.13.8-1-x86_64.pkg.tar.zst")
|
|
||||||
sha256sums=('2a1b0ab11ff213a57268d20fff183e3fd3e4ab9191aeed473de336b77bdfa6e1')
|
|
||||||
|
|
||||||
source_x86_64=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${pkgver//_/-}_amd64.deb")
|
source_x86_64=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${pkgver//_/-}_amd64.deb")
|
||||||
source_i686=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${pkgver//_/-}_i386.deb")
|
source_i686=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${pkgver//_/-}_i386.deb")
|
||||||
source_armv7h=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${pkgver//_/-}_armhf.deb")
|
source_armv7h=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${pkgver//_/-}_armhf.deb")
|
||||||
@@ -35,20 +33,4 @@ package() {
|
|||||||
rm -r "${pkgdir}/etc/init.d"
|
rm -r "${pkgdir}/etc/init.d"
|
||||||
rm -r "${pkgdir}/usr/sbin"
|
rm -r "${pkgdir}/usr/sbin"
|
||||||
echo "g nordvpn - -" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
|
echo "g nordvpn - -" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
|
||||||
#-----------------------------------------------------------------
|
|
||||||
# Bellow is a TEMPORARY fix for the missing libxml2.so.2 library
|
|
||||||
# when upgrading the package to version 2.14.2
|
|
||||||
#-----------------------------------------------------------------
|
|
||||||
# If you wish, you can instead downgrade all your packages
|
|
||||||
# within a specific date:
|
|
||||||
## 1. Edit your /etc/pacman.d/mirrorlist
|
|
||||||
## 2. Include the following line:
|
|
||||||
### Server = https://archive.archlinux.org/repos/2025/04/29/$repo/os/$archive
|
|
||||||
## 3. Then you run:
|
|
||||||
### pacman -Syyuu
|
|
||||||
### (-uu is for downgrade)
|
|
||||||
# done
|
|
||||||
#-----------------------------------------------------------------
|
|
||||||
tar -xvf libxml2-2.13.8-1-x86_64.pkg.tar.zst "usr/lib/libxml2.so.2.13.8"
|
|
||||||
install -Dm 755 "usr/lib/libxml2.so.2.13.8" "${pkgdir}/usr/lib/nordvpn/libxml2.so.2"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ post_install() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
## Temporary fix
|
|
||||||
if [[ ! -e /usr/lib/libxml2.so.2 ]] ; then
|
|
||||||
ln -s /usr/lib/nordvpn/libxml2.so.2 /usr/lib/
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
post_upgrade() {
|
post_upgrade() {
|
||||||
@@ -31,20 +27,34 @@ post_upgrade() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
## Temporary fix
|
|
||||||
if [[ ! -e /usr/lib/libxml2.so.2 ]] ; then
|
|
||||||
ln -s /usr/lib/nordvpn/libxml2.so.2 /usr/lib/
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_install() {
|
pre_install() {
|
||||||
if [ -d /var/lib/nordvpn/data/ ]; then
|
if [ -d /var/lib/nordvpn/data/ ] ; then
|
||||||
chattr -i /var/lib/nordvpn/data/*
|
chattr -i /var/lib/nordvpn/data/*
|
||||||
fi
|
fi
|
||||||
|
## Remove symbolic link from latest patch
|
||||||
|
if [[ $(readlink -- /usr/lib/libxml2.so.2) == /usr/lib/nordvpn/libxml2.so.2 ]] ; then
|
||||||
|
unlink /usr/lib/libxml2.so.2
|
||||||
|
fi
|
||||||
|
echo "::: README"
|
||||||
|
echo "::: Before use, install libxml2-legacy from extra repository."
|
||||||
|
echo "::: It is flagged as optional, but it will be mandatory in next release,"
|
||||||
|
echo "::: in case NordVPN had not built against the new libxml2 just yet."
|
||||||
|
echo "::: 3.20.2-3 was made to remove the symbolic link from previous patch"
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_upgrade() {
|
pre_upgrade() {
|
||||||
chattr -i /var/lib/nordvpn/data/*
|
chattr -i /var/lib/nordvpn/data/*
|
||||||
|
## Remove symbolic link from latest patch
|
||||||
|
if [[ $(readlink -- /usr/lib/libxml2.so.2) == /usr/lib/nordvpn/libxml2.so.2 ]] ; then
|
||||||
|
unlink /usr/lib/libxml2.so.2
|
||||||
|
fi
|
||||||
|
echo "::: README"
|
||||||
|
echo "::: Before use, install libxml2-legacy from extra repository."
|
||||||
|
echo "::: It is flagged as optional, but it will be mandatory in next release,"
|
||||||
|
echo "::: in case NordVPN had not built against the new libxml2 just yet."
|
||||||
|
echo "::: 3.20.2-3 was made to remove the symbolic link from previous patch"
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_remove() {
|
pre_remove() {
|
||||||
@@ -57,8 +67,8 @@ pre_remove() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
## Temporary fix
|
## Remove symbolic link from latest patch
|
||||||
if [[ $(readlink -- /usr/lib/libxml2.so.2) == /usr/lib/nordvpn/libxml2.so.2 ]]; then
|
if [[ $(readlink -- /usr/lib/libxml2.so.2) == /usr/lib/nordvpn/libxml2.so.2 ]] ; then
|
||||||
unlink /usr/lib/libxml2.so.2
|
unlink /usr/lib/libxml2.so.2
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user