v2.4.4

3 files changed, 32 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40439dae21a7..2142fd1900cd 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.4.3
+	pkgver = 2.4.4
 	pkgrel = 1
 	url = https://github.com/openvpn/openvpn
 	arch = i686
@@ -14,27 +14,30 @@ pkgbase = openvpn-xor-git
 	depends = libsystemd
 	depends = pkcs11-helper
 	optdepends = easy-rsa
-	provides = openvpn=2.4.3
+	optdepends = pam
+	optdepends = qopenvpn
+	provides = openvpn=2.4.4
 	provides = openvpn-dev
 	conflicts = openvpn
 	conflicts = openvpn-dev
 	conflicts = openvpn-git
-	source = https://github.com/openvpn/openvpn/archive/v2.4.3.tar.gz
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.3/patches/02-tunnelblick-openvpn_xorpatch-a.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.3/patches/03-tunnelblick-openvpn_xorpatch-b.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.3/patches/04-tunnelblick-openvpn_xorpatch-c.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.3/patches/05-tunnelblick-openvpn_xorpatch-d.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.3/patches/06-tunnelblick-openvpn_xorpatch-e.diff
+	conflicts = openvpn-xor-patched
+	source = https://github.com/openvpn/openvpn/archive/v2.4.4.tar.gz
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/02-tunnelblick-openvpn_xorpatch-a.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/03-tunnelblick-openvpn_xorpatch-b.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/04-tunnelblick-openvpn_xorpatch-c.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/05-tunnelblick-openvpn_xorpatch-d.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/06-tunnelblick-openvpn_xorpatch-e.diff
 	source = openvpn-xor-watermark.diff
 	source = systemd.diff
-	sha256sums = d2d0e65ecdc5a69ddf4a34c41cd0ec4b7e5bc1806897f78df99c9c6e3133a294
+	sha256sums = be4547574d6b42beb7580257d9214009d011f8210462d346fa66b0e656a79a3a
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 3eb01176fff1d3b450b15f280a536323fc5161f3cfa0ee5fcccadeacc7ad97c9
-	sha256sums = 6d341005060488af7f4961262819a9fbfe5fbe59ac0d31de4368074a506d9dec
+	sha256sums = 6e1d0147076ce0221e4e22e0a10d70c17eaa3740fe21461aff931c107416564f
 
 pkgname = openvpn-xor-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 233ab1866aea..1db69cc9ecd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,29 @@
-    # Maintainer: Pete Alexandrou <pete@ozmartians.com>
+# Maintainer: Pete Alexandrou <pete@ozmartians.com>
 pkgname=openvpn-xor-git
 _pkgname=openvpn
-pkgver=2.4.3
+pkgver=2.4.4
 pkgrel=1
 pkgdesc='OpenVPN with XOR patch to bypass DPI monitoring in places like China (also known as OpenVPN stealth/scramble mode)'
 arch=('i686' 'x86_64')
 url='https://github.com/openvpn/openvpn'
 depends=('openssl' 'lzo' 'iproute2' 'libsystemd' 'pkcs11-helper')
-optdepends=('easy-rsa')
+optdepends=('easy-rsa' 'pam' 'qopenvpn')
 makedepends=('git' 'systemd')
-conflicts=('openvpn' 'openvpn-dev' 'openvpn-git')
-provides=('openvpn=2.4.3' 'openvpn-dev')
+conflicts=('openvpn' 'openvpn-dev' 'openvpn-git' 'openvpn-xor-patched')
+provides=('openvpn=2.4.4' 'openvpn-dev')
 license=('custom')
 source=("https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz"
-	   "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/02-tunnelblick-openvpn_xorpatch-a.diff"
-	   "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/03-tunnelblick-openvpn_xorpatch-b.diff"
-	   "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/04-tunnelblick-openvpn_xorpatch-c.diff"
-	   "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/05-tunnelblick-openvpn_xorpatch-d.diff"
-	   "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/06-tunnelblick-openvpn_xorpatch-e.diff"
-          "openvpn-xor-watermark.diff"
-          "systemd.diff")
-sha256sums=('d2d0e65ecdc5a69ddf4a34c41cd0ec4b7e5bc1806897f78df99c9c6e3133a294'
+	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/02-tunnelblick-openvpn_xorpatch-a.diff"
+	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/03-tunnelblick-openvpn_xorpatch-b.diff"
+	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/04-tunnelblick-openvpn_xorpatch-c.diff"
+	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/05-tunnelblick-openvpn_xorpatch-d.diff"
+	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/06-tunnelblick-openvpn_xorpatch-e.diff"
+        "openvpn-xor-watermark.diff"
+        "systemd.diff")
+sha256sums=('be4547574d6b42beb7580257d9214009d011f8210462d346fa66b0e656a79a3a'
             'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
             '3eb01176fff1d3b450b15f280a536323fc5161f3cfa0ee5fcccadeacc7ad97c9'
-            '6d341005060488af7f4961262819a9fbfe5fbe59ac0d31de4368074a506d9dec')
+            '6e1d0147076ce0221e4e22e0a10d70c17eaa3740fe21461aff931c107416564f')
 
 prepare() {
     cd "${_pkgname}-${pkgver}"/
@@ -54,7 +54,7 @@ build() {
         --enable-pkcs11 \
         --enable-plugins \
         --enable-systemd \
-        --enable-x509-alt-username       
+        --enable-x509-alt-username
 
     make
 }
diff --git a/systemd.diff b/systemd.diff
index e665584cd6e0..419a77b47ad6 100644
--- a/systemd.diff
+++ b/systemd.diff
@@ -1,6 +1,5 @@
-diff -ur openvpn-2.4.1/distro/systemd/openvpn-client@.service.in openvpn-2.4.1-patched/distro/systemd/openvpn-client@.service.in
---- openvpn-2.4.1/distro/systemd/openvpn-client@.service.in	2017-03-22 20:04:21.000000000 +0430
-+++ openvpn-2.4.1-patched/distro/systemd/openvpn-client@.service.in	2017-04-09 22:38:33.205789531 +0430
+--- a/distro/systemd/openvpn-client@.service.in
++++ b/distro/systemd/openvpn-client@.service.in
 @@ -7,7 +7,7 @@
  Documentation=https://community.openvpn.net/openvpn/wiki/HOWTO
  
@@ -10,9 +9,8 @@ diff -ur openvpn-2.4.1/distro/systemd/openvpn-client@.service.in openvpn-2.4.1-p
  PrivateTmp=true
  WorkingDirectory=/etc/openvpn/client
  ExecStart=@sbindir@/openvpn --suppress-timestamps --nobind --config %i.conf
-diff -ur openvpn-2.4.1/distro/systemd/openvpn-server@.service.in openvpn-2.4.1-patched/distro/systemd/openvpn-server@.service.in
---- openvpn-2.4.1/distro/systemd/openvpn-server@.service.in	2017-03-22 20:04:21.000000000 +0430
-+++ openvpn-2.4.1-patched/distro/systemd/openvpn-server@.service.in	2017-04-09 22:39:31.110253972 +0430
+--- a/distro/systemd/openvpn-server@.service.in
++++ b/distro/systemd/openvpn-server@.service.in
 @@ -8,6 +8,7 @@
  
  [Service]