From b7b40ae6779e56e33e65ea87206484968c9b819a Mon Sep 17 00:00:00 2001
From: Ben Mezger <me@benmezger.nl>
Date: Sun, 14 Jan 2024 00:27:01 +0100
Subject: [PATCH] nordvpn: replace with submodule

---
 .gitmodules                     |  3 +++
 nordvpn-bin                     |  1 +
 nordvpn-bin/.SRCINFO            | 22 --------------------
 nordvpn-bin/PKGBUILD            | 37 ---------------------------------
 nordvpn-bin/README.md           |  1 -
 nordvpn-bin/nordvpn-bin.install | 29 --------------------------
 6 files changed, 4 insertions(+), 89 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 nordvpn-bin
 delete mode 100644 nordvpn-bin/.SRCINFO
 delete mode 100644 nordvpn-bin/PKGBUILD
 delete mode 100644 nordvpn-bin/README.md
 delete mode 100644 nordvpn-bin/nordvpn-bin.install

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..de8c006
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "nordvpn-bin"]
+	path = nordvpn-bin
+	url = https://aur.archlinux.org/nordvpn-bin.git
diff --git a/nordvpn-bin b/nordvpn-bin
new file mode 160000
index 0000000..cc56e80
--- /dev/null
+++ b/nordvpn-bin
@@ -0,0 +1 @@
+Subproject commit cc56e800e31cafab2158b20791beb4d770600586
diff --git a/nordvpn-bin/.SRCINFO b/nordvpn-bin/.SRCINFO
deleted file mode 100644
index 7a1cde5..0000000
--- a/nordvpn-bin/.SRCINFO
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgbase = nordvpn-bin
-	pkgdesc = NordVPN CLI tool for Linux
-	pkgver = 3.16.3
-	pkgrel = 1
-	url = https://nordvpn.com/download/linux/
-	install = nordvpn-bin.install
-	arch = x86_64
-	arch = i686
-	arch = armv7h
-	arch = aarch64
-	license = GPL3
-	depends = libxml2
-	provides = nordvpn
-	conflicts = openvpn-nordvpn
-	source_x86_64 = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_3.16.3_amd64.deb
-	sha256sums_x86_64 = 77d022e16911d77bcc0f3cfc9dc977070951a84f6882aaa82d50d941fd542481
-	source_i686 = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_3.16.3_i386.deb
-	sha256sums_i686 = 48be2b038d79df49aec7d89e8ff1af81bbf11b7d0c18383e2762a6c2eb83ff21
-	source_armv7h = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_3.16.3_armhf.deb
-	sha256sums_armv7h = 5f7ac59d85d6b8d8d55aafd3a8782243247f457794713baf11e6e9366a7675db
-	source_aarch64 = https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_3.16.3_arm64.deb
-	sha256sums_aarch64 = 879ff28a962a44cf0a868dcb796f5ea8dd185ef81f23f9617a79ac8743abbb2f
diff --git a/nordvpn-bin/PKGBUILD b/nordvpn-bin/PKGBUILD
deleted file mode 100644
index faa1360..0000000
--- a/nordvpn-bin/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Cabel <mxzcabel at proton dot me>
-# Contributor: metiis <aur at metiis dot com>
-# Contributor: Julio Gutierrez <bubuntux at gmail dot com>
-# Contributor: Martoko <mbastholm at gmail dot com>
-
-pkgname=nordvpn-bin
-pkgver=3.16.3
-pkgrel=1
-pkgdesc="NordVPN CLI tool for Linux"
-arch=('x86_64' 'i686' 'armv7h' 'aarch64')
-url="https://nordvpn.com/download/linux/"
-license=('GPL3')
-depends=('libxml2')
-provides=('nordvpn')
-conflicts=('openvpn-nordvpn')
-install=nordvpn-bin.install
-source_x86_64=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_amd64.deb")
-source_i686=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_i386.deb")
-source_armv7h=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_armhf.deb")
-source_aarch64=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_arm64.deb")
-sha256sums_x86_64=('77d022e16911d77bcc0f3cfc9dc977070951a84f6882aaa82d50d941fd542481')
-sha256sums_i686=('48be2b038d79df49aec7d89e8ff1af81bbf11b7d0c18383e2762a6c2eb83ff21')
-sha256sums_armv7h=('5f7ac59d85d6b8d8d55aafd3a8782243247f457794713baf11e6e9366a7675db')
-sha256sums_aarch64=('879ff28a962a44cf0a868dcb796f5ea8dd185ef81f23f9617a79ac8743abbb2f')
-
-
-# There is also ArmEABI architecture for android devices available. Download with:
-# https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_3.16.3_armel.deb
-
-package() {
-    bsdtar -O -xf *.deb data.tar.gz | bsdtar -C "${pkgdir}" -xJf -
-
-    mv "${pkgdir}/usr/sbin/nordvpnd" "${pkgdir}/usr/bin"
-    rm -r "${pkgdir}/etc/init.d"
-    rm -r "${pkgdir}/usr/sbin"
-    echo "g nordvpn - -" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-}
diff --git a/nordvpn-bin/README.md b/nordvpn-bin/README.md
deleted file mode 100644
index 670fe5b..0000000
--- a/nordvpn-bin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Taken from https://aur.archlinux.org/packages/nordvpn-bin
diff --git a/nordvpn-bin/nordvpn-bin.install b/nordvpn-bin/nordvpn-bin.install
deleted file mode 100644
index 2065944..0000000
--- a/nordvpn-bin/nordvpn-bin.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-  echo ':: In order to enable nordvpn you have to start the following service:'
-  echo '     sudo systemctl enable --now nordvpnd'
-  echo ':: You have to add yourself to the nordvpn group:'
-  echo "     sudo gpasswd -a USERNAME nordvpn"
-  echo ':: You then have to restart for the group to be created:'
-  echo "     reboot"
-}
-
-post_upgrade() {
-  echo ':: In order to enable nordvpn you have to start the following service:'
-  echo '     sudo systemctl enable --now nordvpnd'
-  echo ':: You have to add yourself to the nordvpn group:'
-  echo "     sudo gpasswd -a USERNAME nordvpn"
-  echo ':: You then have to restart for the group to be created:'
-  echo "     reboot"
-}
-
-pre_install() {
-  chattr -i /var/lib/nordvpn/data/*
-}
-
-pre_upgrade() {
-  chattr -i /var/lib/nordvpn/data/*
-}
-
-pre_remove() {
-  chattr -i /var/lib/nordvpn/data/*
-}