summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Spangenberger2016-10-01 06:50:32 -0400
committerJesse Spangenberger2016-10-01 06:50:32 -0400
commite8c2db289f56981f9756f678665fa8b16ccfe27f (patch)
tree3e31ee0c9f87424f00ec1790f00a4f3bbb26c78a
parent2b0ea3e6212e9862b74cca4aaf34be26011d181f (diff)
downloadaur-e8c2db289f56981f9756f678665fa8b16ccfe27f.tar.gz
Removed patch. Fixed upstream
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--update-resolv-conf.patch11
3 files changed, 5 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 419a9312320d..3e201a90630d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Sep 29 21:07:17 UTC 2016
+# Sat Oct 1 10:50:19 UTC 2016
pkgbase = private-internet-access-vpn-dev
pkgdesc = Installs VPN profiles for Private Internet Access Service
pkgver = 3.2b
- pkgrel = 1
+ pkgrel = 2
url = https://www.privateinternetaccess.com/
arch = any
license = GPL
@@ -26,7 +26,6 @@ pkgbase = private-internet-access-vpn-dev
source = pia.8.gz
source = git://github.com/flamusdiu/python-pia.git#branch=dev
source = git://github.com/masterkorp/openvpn-update-resolv-conf.git
- source = update-resolv-conf.patch
sha256sums = 1f57eb735141b767f19d653ffa434ffa2d1108c2a5b74fe61c72542056360c77
sha256sums = 9d28e1883d5f2e1b017789c051c6377b1e97ed86f72f84f3ca33b15a909947c7
sha256sums = 4322a2a4bc3e206c6ab7e1df87a8805032b76c177c1ed9dd3501260ed32ccb30
@@ -36,7 +35,6 @@ pkgbase = private-internet-access-vpn-dev
sha256sums = dd15ff9d020d6779c51bff560c8571b462cc7ca3f4d2a92b8103056be4b2e0fd
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = b346249c40d4eab7cf5a2b682b10f574d5f8ad6cf2b62604f15261a246b5f5a1
pkgname = private-internet-access-vpn-dev
diff --git a/PKGBUILD b/PKGBUILD
index ab679ddfcf85..362111c2739a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jesse Spangenberger <azulephoenix@gmail.com>
pkgname=private-internet-access-vpn-dev
pkgver=3.2b
-pkgrel=1
+pkgrel=2
pkgdesc="Installs VPN profiles for Private Internet Access Service"
arch=('any')
url="https://www.privateinternetaccess.com/"
@@ -19,8 +19,7 @@ sha256sums=('1f57eb735141b767f19d653ffa434ffa2d1108c2a5b74fe61c72542056360c77'
'7f4a5ee1fb8ea4d0e69ed2a8217c575cf335f21e90082f6e423c769eca4a7a46'
'dd15ff9d020d6779c51bff560c8571b462cc7ca3f4d2a92b8103056be4b2e0fd'
'SKIP'
- 'SKIP'
- 'b346249c40d4eab7cf5a2b682b10f574d5f8ad6cf2b62604f15261a246b5f5a1')
+ 'SKIP')
source=("https://www.privateinternetaccess.com/openvpn/openvpn.zip"
"https://www.privateinternetaccess.com/openvpn/openvpn-strong.zip"
@@ -30,8 +29,7 @@ source=("https://www.privateinternetaccess.com/openvpn/openvpn.zip"
"vpn.sh"
"pia.8.gz"
"git://github.com/flamusdiu/python-pia.git#branch=dev"
- "git://github.com/masterkorp/openvpn-update-resolv-conf.git"
- "update-resolv-conf.patch")
+ "git://github.com/masterkorp/openvpn-update-resolv-conf.git")
noextract=("openvpn.zip"
"openvpn-strong.zip"
@@ -59,9 +57,6 @@ prepare() {
done
msg2 "Done."
-
- msg2 "Patching update-resolv-conf ..."
- patch -Np1 "${srcdir}/openvpn-update-resolv-conf/update-resolv-conf.sh" "${srcdir}/update-resolv-conf.patch"
}
package() {
diff --git a/update-resolv-conf.patch b/update-resolv-conf.patch
deleted file mode 100644
index 93f84c5b5db1..000000000000
--- a/update-resolv-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /etc/openvpn/update-resolv-conf 2016-05-29 22:27:25.955162159 -0400
-+++ update-resolv-conf 2016-05-29 22:27:57.145164268 -0400
-@@ -18,7 +18,7 @@
- # foreign_option_4='dhcp-option DOMAIN-SEARCH bnc.local'
-
- ## You might need to set the path manually here, i.e.
--RESOLVCONF=$(which resolvconf)
-+RESOLVCONF=$(type -p resolvconf)
-
- case $script_type in
-