update to 2.6.0

3 files changed, 23 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2243dcf570f0..3c69a39134b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openvpn-xor-git
 	pkgdesc = OpenVPN with XOR patch to bypass DPI monitoring in places like China (also known as OpenVPN stealth/scramble mode)
-	pkgver = 2.5.8
+	pkgver = 2.6.0
 	pkgrel = 1
 	url = https://github.com/openvpn/openvpn
 	arch = x86_64
@@ -20,23 +20,23 @@ pkgbase = openvpn-xor-git
 	optdepends = easy-rsa
 	optdepends = pam
 	optdepends = qopenvpn
-	provides = openvpn=2.5.8
+	provides = openvpn=2.6.0
 	provides = openvpn-dev
 	conflicts = openvpn
 	conflicts = openvpn-dev
 	conflicts = openvpn-git
 	conflicts = openvpn-xor-patched
 	conflicts = libressl
-	source = https://github.com/openvpn/openvpn/archive/v2.5.8.tar.gz
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/02-tunnelblick-openvpn_xorpatch-a.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/03-tunnelblick-openvpn_xorpatch-b.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/04-tunnelblick-openvpn_xorpatch-c.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/05-tunnelblick-openvpn_xorpatch-d.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/06-tunnelblick-openvpn_xorpatch-e.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/10-route-gateway-dhcp.diff
+	source = https://github.com/openvpn/openvpn/archive/v2.6.0.tar.gz
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/02-tunnelblick-openvpn_xorpatch-a.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/03-tunnelblick-openvpn_xorpatch-b.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/04-tunnelblick-openvpn_xorpatch-c.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/05-tunnelblick-openvpn_xorpatch-d.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/06-tunnelblick-openvpn_xorpatch-e.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/10-route-gateway-dhcp.diff
 	source = systemd.diff
 	source = openvpn-xor-watermark.diff
-	sha256sums = c216a66c967181b38002c1fd06fb5cad4a8c21865af76cb22b3bf4786070d315
+	sha256sums = 31a22d9746b6509c70e4de1be983917425730a4093f43dfe86ff57dc36824a69
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -44,6 +44,6 @@ pkgbase = openvpn-xor-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 6e1d0147076ce0221e4e22e0a10d70c17eaa3740fe21461aff931c107416564f
-	sha256sums = 1232b23c6885588c05c521b3722e45b1d79558e24095a4b6d99729ba83ba481b
+	sha256sums = 1f3455ed9dbfa7e98799e5e5c7ca1cdeee0745f2759db8eb8111142a9eff73ac
 
 pkgname = openvpn-xor-git
diff --git a/PKGBUILD b/PKGBUILD
index dd27cbde683d..ad784d45c381 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Pete Alexandrou <pete@ozmartians.com>
 pkgname=openvpn-xor-git
-pkgver=2.5.8
+pkgver=2.6.0
 pkgrel=1
 pkgdesc='OpenVPN with XOR patch to bypass DPI monitoring in places like China (also known as OpenVPN stealth/scramble mode)'
 arch=('x86_64')
@@ -9,21 +9,21 @@ depends=('openssl' 'lzo' 'iproute2' 'libsystemd' 'pkcs11-helper' 'python-docutil
 optdepends=('easy-rsa' 'pam' 'qopenvpn')
 makedepends=('git' 'systemd' 'make' 'pkgconf' 'automake' 'autoconf')
 conflicts=('openvpn' 'openvpn-dev' 'openvpn-git' 'openvpn-xor-patched' 'libressl')
-provides=('openvpn=2.5.8' 'openvpn-dev')
+provides=('openvpn=2.6.0' 'openvpn-dev')
 license=('custom')
 source=("https://github.com/${pkgname%-xor-git}/${pkgname%-xor-git}/archive/v${pkgver}.tar.gz"
-        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/02-tunnelblick-openvpn_xorpatch-a.diff"
-        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/03-tunnelblick-openvpn_xorpatch-b.diff"
-        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/04-tunnelblick-openvpn_xorpatch-c.diff"
-        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/05-tunnelblick-openvpn_xorpatch-d.diff"
-        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/06-tunnelblick-openvpn_xorpatch-e.diff"
-        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.6/patches/10-route-gateway-dhcp.diff"
+        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/02-tunnelblick-openvpn_xorpatch-a.diff"
+        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/03-tunnelblick-openvpn_xorpatch-b.diff"
+        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/04-tunnelblick-openvpn_xorpatch-c.diff"
+        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/05-tunnelblick-openvpn_xorpatch-d.diff"
+        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/06-tunnelblick-openvpn_xorpatch-e.diff"
+        "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.6.0/patches/10-route-gateway-dhcp.diff"
         "systemd.diff"
         "openvpn-xor-watermark.diff")
-sha256sums=('c216a66c967181b38002c1fd06fb5cad4a8c21865af76cb22b3bf4786070d315'
+sha256sums=('31a22d9746b6509c70e4de1be983917425730a4093f43dfe86ff57dc36824a69'
             'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
             '6e1d0147076ce0221e4e22e0a10d70c17eaa3740fe21461aff931c107416564f'
-            '1232b23c6885588c05c521b3722e45b1d79558e24095a4b6d99729ba83ba481b')
+            '1f3455ed9dbfa7e98799e5e5c7ca1cdeee0745f2759db8eb8111142a9eff73ac')
 prepare() {
     cd "${pkgname%-xor-git}-${pkgver}"/
 
@@ -39,7 +39,7 @@ prepare() {
     git apply "${startdir}/10-route-gateway-dhcp.diff"
 
     # apply XOR watermark patch to "brand" binary with XOR signature in version header
-    git apply "${startdir}/openvpn-xor-watermark.diff"
+    # git apply "${startdir}/openvpn-xor-watermark.diff"
 }
 
 build() {
diff --git a/openvpn-xor-watermark.diff b/openvpn-xor-watermark.diff
index 0dd2b882c76b..bc163579ae76 100644
--- a/openvpn-xor-watermark.diff
+++ b/openvpn-xor-watermark.diff
@@ -1,6 +1,6 @@
 --- a/src/openvpn/options.c
 +++ b/src/openvpn/options.c
-@@ -107,3 +107,4 @@ const char title_string[] =
+@@ -109,3 +109,4 @@ const char title_string[] =
      " [AEAD]"
 +    " [XOR]"
      " built on " __DATE__