summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD76
2 files changed, 50 insertions, 50 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ec05880ad2d..2e8100e10f87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed May 24 20:24:49 UTC 2017
pkgbase = private-internet-access-vpn-dev
pkgdesc = Installs VPN profiles for Private Internet Access Service
- pkgver = 3.3.2
+ pkgver = 3.4.1
pkgrel = 2
url = https://www.privateinternetaccess.com/
arch = any
@@ -11,23 +9,23 @@ pkgbase = private-internet-access-vpn-dev
depends = python
depends = python-setuptools
depends = python-docopt
- optdepends = networkmanager: Enables PIA for Network Manager
+ depends = openvpn
+ optdepends = networkmanager: Enables PIA for Network Manager (needs a openvpn plugin)
optdepends = connman: Enables PIA for Connman
- optdepends = openvpn: Allows running configurations from command-line
- noextract = openvpn.zip
- noextract = openvpn-strong.zip
+ noextract = default-3.4.1-2.zip
+ noextract = strong-3.4.1-2.zip
noextract = pia.8.gz
- source = https://www.privateinternetaccess.com/openvpn/openvpn.zip
- source = https://www.privateinternetaccess.com/openvpn/openvpn-strong.zip
+ source = default-3.4.1-2.zip::https://www.privateinternetaccess.com/openvpn/openvpn.zip
+ source = strong-3.4.1-2.zip::https://www.privateinternetaccess.com/openvpn/openvpn-strong.zip
source = login-example.conf
source = pia-example.conf
source = restart.conf
source = vpn.sh
source = pia.8.gz
- source = git://github.com/flamusdiu/python-pia.git#branch=dev
- source = git://github.com/masterkorp/openvpn-update-resolv-conf.git
- sha256sums = 1ac34e3a4ade51dd726f1de8697f280f78433e1f3cd9c888751383dfdf7605b4
- sha256sums = 4897c3a8dd988e87c4c53db2dd1522a0a7112d58a0357425c09d1ce5f9f5a1b5
+ source = git+https://github.com/flamusdiu/python-pia.git#tag=dev
+ source = git+https://github.com/masterkorp/openvpn-update-resolv-conf.git
+ sha256sums = bc38427782aedc90cb65b322cd6f9d74af4e988cc5b3c884e43236ed7a5e4491
+ sha256sums = 38758f393590c51ec1566aba19beaed7c4fa8bd6f7c323f44ab00b9eb9fd7577
sha256sums = 4322a2a4bc3e206c6ab7e1df87a8805032b76c177c1ed9dd3501260ed32ccb30
sha256sums = 797dbdb6e3aadc86f97262e26d61cf4847caf85dda4b7a97cac59088cb912b27
sha256sums = 246fc4dc3218f56b4c70014df6801b10fc2a573d6545962b7fce05f16908c54e
diff --git a/PKGBUILD b/PKGBUILD
index 8509bef5b9d7..4c0c656014f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,19 @@
# Maintainer: Jesse Spangenberger <azulephoenix@gmail.com>
+
pkgname=private-internet-access-vpn-dev
-pkgver=3.3.2
+pkgver=3.4.1
pkgrel=2
pkgdesc="Installs VPN profiles for Private Internet Access Service"
-arch=('any')
+arch=("any")
url="https://www.privateinternetaccess.com/"
license=('GPL')
-depends=('python' 'python-setuptools' 'python-docopt')
+depends=('python' 'python-setuptools' 'python-docopt' 'openvpn')
makedepends=('git')
-optdepends=('networkmanager: Enables PIA for Network Manager'
- 'connman: Enables PIA for Connman'
- 'openvpn: Allows running configurations from command-line')
-sha256sums=('1ac34e3a4ade51dd726f1de8697f280f78433e1f3cd9c888751383dfdf7605b4'
- '4897c3a8dd988e87c4c53db2dd1522a0a7112d58a0357425c09d1ce5f9f5a1b5'
+optdepends=('networkmanager: Enables PIA for Network Manager (needs a openvpn plugin)'
+ 'connman: Enables PIA for Connman')
+
+sha256sums=('bc38427782aedc90cb65b322cd6f9d74af4e988cc5b3c884e43236ed7a5e4491'
+ '38758f393590c51ec1566aba19beaed7c4fa8bd6f7c323f44ab00b9eb9fd7577'
'4322a2a4bc3e206c6ab7e1df87a8805032b76c177c1ed9dd3501260ed32ccb30'
'797dbdb6e3aadc86f97262e26d61cf4847caf85dda4b7a97cac59088cb912b27'
'246fc4dc3218f56b4c70014df6801b10fc2a573d6545962b7fce05f16908c54e'
@@ -21,52 +22,53 @@ sha256sums=('1ac34e3a4ade51dd726f1de8697f280f78433e1f3cd9c888751383dfdf7605b4'
'SKIP'
'SKIP')
-source=("https://www.privateinternetaccess.com/openvpn/openvpn.zip"
- "https://www.privateinternetaccess.com/openvpn/openvpn-strong.zip"
- "login-example.conf"
- "pia-example.conf"
- "restart.conf"
- "vpn.sh"
- "pia.8.gz"
- "git://github.com/flamusdiu/python-pia.git#branch=dev"
- "git://github.com/masterkorp/openvpn-update-resolv-conf.git")
-
-noextract=("openvpn.zip"
- "openvpn-strong.zip"
- "pia.8.gz")
+source=("default-$pkgver-$pkgrel.zip::https://www.privateinternetaccess.com/openvpn/openvpn.zip"
+ "strong-$pkgver-$pkgrel.zip::https://www.privateinternetaccess.com/openvpn/openvpn-strong.zip"
+ "login-example.conf"
+ "pia-example.conf"
+ "restart.conf"
+ "vpn.sh"
+ "pia.8.gz"
+ "git+https://github.com/flamusdiu/python-pia.git#tag=dev"
+ "git+https://github.com/masterkorp/openvpn-update-resolv-conf.git")
+
+noextract=("default-$pkgver-$pkgrel.zip"
+ "strong-$pkgver-$pkgrel.zip"
+ "pia.8.gz")
prepare() {
cd "${srcdir}"
-
+
msg2 "Extracting Certifications..."
- bsdtar -xf openvpn.zip "*.pem" "*.crt"
- bsdtar -xf openvpn-strong.zip "*.pem" "*.crt"
-
+ bsdtar -xf default-$pkgver-$pkgrel.zip "*.pem" "*.crt"
+ bsdtar -xf strong-$pkgver-$pkgrel.zip "*.pem" "*.crt"
+
msg2 "Extracting OpenVPN Configurations..."
+ if [ -d "vpn-configs" ]; then
+ rm -rf vpn-configs
+ fi
mkdir "vpn-configs"
- bsdtar -xf openvpn.zip -C vpn-configs *.ovpn
-
+ bsdtar -xf default-$pkgver-$pkgrel.zip -C vpn-configs *.ovpn
+
cd "vpn-configs"
msg2 "Creating Remote Host List..."
touch ../vpn-hosts.txt
-
- find *.ovpn -print0 | while read -d $'\0' file
- do
- host=$(egrep -o "([-A-Za-z]+\.privateinternetaccess\.com)" "$file")
- printf "%s,%s\n" "${file/%.ovpn/}" ${host} >> ../vpn-hosts.txt
- done
-
+
+ grep -Eo "\s(.*\.privacy\.network)\s" *.ovpn | \
+ sed 's/_/ /g;s/.ovpn//;s/: /,/;s/[^ ]\+/\L\u&/g;s/\b\([a-z]\{2\}\)\s/\U&/gi' \
+ >> ../vpn-hosts.txt
+
msg2 "Done."
}
package() {
cd "${srcdir}"
- install -D -m 644 restart.conf "${pkgdir}/usr/lib/system/openvpn-client@.service.d/restart.conf"
- install -D -m 755 vpn.sh "${pkgdir}/usr/lib/system/systemd/system-sleep/vpn.sh"
+ install -D -m 644 restart.conf "${pkgdir}/usr/lib/systemd/openvpn-client@.service.d/restart.conf"
+ install -D -m 755 vpn.sh "${pkgdir}/usr/lib/systemd/system/system-sleep/vpn.sh"
install -D -m 644 pia.8.gz "${pkgdir}/usr/share/man/man8/pia.8.gz"
-
+
install -dm755 "${pkgdir}"/etc/{openvpn,private-internet-access}
install -g network -dm750 "${pkgdir}"/etc/openvpn/client