v2.4.1 w/watermark patch included

3 files changed, 55 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0901d9412261..417efb0fa393 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openvpn-xor-git
-	pkgdesc = An easy-to-use, robust and highly configurable VPN (Virtual Private Network) - git checkout
-	pkgver = 2.4.0
+	pkgdesc = OpenVPN with XOR patch to bypass DPI monitoring in places like China (also known as OpenVPN stealth/scramble mode)
+	pkgver = 2.4.1
 	pkgrel = 1
 	url = https://github.com/Tunnelblick/Tunnelblick/tree/master/third_party/sources/openvpn
 	arch = i686
@@ -13,24 +13,26 @@ pkgbase = openvpn-xor-git
 	depends = iproute2
 	depends = libsystemd
 	depends = pkcs11-helper
-	optdepends = easy-rsa: easy CA and certificate handling
-	provides = openvpn=2.4.0
+	optdepends = easy-rsa
+	provides = openvpn=${pkg tver}
 	provides = openvpn-dev
 	conflicts = openvpn
 	conflicts = openvpn-dev
 	conflicts = openvpn-git
-	source = https://github.com/openvpn/openvpn/archive/v2.4.0.tar.gz
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.0/patches/02-tunnelblick-openvpn_xorpatch-a.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.0/patches/03-tunnelblick-openvpn_xorpatch-b.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.0/patches/04-tunnelblick-openvpn_xorpatch-c.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.0/patches/05-tunnelblick-openvpn_xorpatch-d.diff
-	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.0/patches/06-tunnelblick-openvpn_xorpatch-e.diff
-	sha256sums = SKIP
+	source = https://github.com/openvpn/openvpn/archive/v2.4.1.tar.gz
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.1/patches/02-tunnelblick-openvpn_xorpatch-a.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.1/patches/03-tunnelblick-openvpn_xorpatch-b.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.1/patches/04-tunnelblick-openvpn_xorpatch-c.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.1/patches/05-tunnelblick-openvpn_xorpatch-d.diff
+	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.1/patches/06-tunnelblick-openvpn_xorpatch-e.diff
+	source = openvpn-xor-watermark.diff
+	sha256sums = 1ff76af8175ee86878ab58a42f7ef829f07443b486398a29e7627c21b1c8aa6f
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 3eb01176fff1d3b450b15f280a536323fc5161f3cfa0ee5fcccadeacc7ad97c9
 
 pkgname = openvpn-xor-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 27235d4119cb..023ce4f1a48d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,62 @@
 # Maintainer: Pete Alexandrou <pete@ozmartians.com>
 pkgname=openvpn-xor-git
 _pkgname=openvpn
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
-pkgdesc='An easy-to-use, robust and highly configurable VPN (Virtual Private Network) - git checkout'
+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/Tunnelblick/Tunnelblick/tree/master/third_party/sources/openvpn'
 depends=('openssl' 'lzo' 'iproute2' 'libsystemd' 'pkcs11-helper')
-optdepends=('easy-rsa: easy CA and certificate handling')
+optdepends=('easy-rsa')
 makedepends=('git' 'systemd')
 conflicts=('openvpn' 'openvpn-dev' 'openvpn-git')
-provides=('openvpn=2.4.0' 'openvpn-dev')
+provides=('openvpn=${pkg tver}' '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")
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+	   "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-${pkgver}/patches/06-tunnelblick-openvpn_xorpatch-e.diff"
+          "openvpn-xor-watermark.diff")
+sha256sums=('1ff76af8175ee86878ab58a42f7ef829f07443b486398a29e7627c21b1c8aa6f'
+               'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+               '3eb01176fff1d3b450b15f280a536323fc5161f3cfa0ee5fcccadeacc7ad97c9')
 
 prepare() {
-	cd "${_pkgname}-${pkgver}"/
+    cd "${_pkgname}-${pkgver}"/
+
+    # regenerate configure script
+    autoreconf -vi
 
-	# regenerate configure script
-	autoreconf -vi
+    # apply Tunnelblick patches to the source
+    git apply "${startdir}/02-tunnelblick-openvpn_xorpatch-a.diff"
+    git apply "${startdir}/03-tunnelblick-openvpn_xorpatch-b.diff"
+    git apply "${startdir}/04-tunnelblick-openvpn_xorpatch-c.diff"
+    git apply "${startdir}/05-tunnelblick-openvpn_xorpatch-d.diff"
+    git apply "${startdir}/06-tunnelblick-openvpn_xorpatch-e.diff"
 
-	# apply Tunnelblick patches to the source
-	git apply ../../02-tunnelblick-openvpn_xorpatch-a.diff
-	git apply ../../03-tunnelblick-openvpn_xorpatch-b.diff
-	git apply ../../04-tunnelblick-openvpn_xorpatch-c.diff
-	git apply ../../05-tunnelblick-openvpn_xorpatch-d.diff
-	git apply ../../06-tunnelblick-openvpn_xorpatch-e.diff
+    # apply XOR watermark patch to "brand" binary with XOR signature in version header
+    git apply "${startdir}/openvpn-xor-watermark.diff"
 }
 
 build() {
-	cd "${_pkgname}-${pkgver}"/
+    cd "${_pkgname}-${pkgver}"/
 
-	./configure \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--enable-iproute2 \
-		--enable-pkcs11 \
-		--enable-plugins \
-		--enable-systemd \
-		--enable-x509-alt-username
-	 make
+    ./configure \
+    	--prefix=/usr \
+    	--sbindir=/usr/bin \
+    	--enable-iproute2 \
+    	--enable-pkcs11 \
+    	--enable-plugins \
+    	--enable-systemd \
+    	--enable-x509-alt-username
+
+    make
 }
 
 check() {
 	cd "${_pkgname}-${pkgver}"/
-
 	make check
 }
 
@@ -79,4 +85,3 @@ package() {
 		esac
 	done
 }
-
diff --git a/openvpn-xor-watermark.diff b/openvpn-xor-watermark.diff
new file mode 100644
index 000000000000..1d11cd071303
--- /dev/null
+++ b/openvpn-xor-watermark.diff
@@ -0,0 +1,10 @@
+--- a/src/openvpn/options.c
++++ b/src/openvpn/options.c
+@@ -107,6 +107,7 @@ const char title_string[] =
+ #ifdef HAVE_AEAD_CIPHER_MODES
+     " [AEAD]"
+ #endif
++    " [XOR]"
+     " built on " __DATE__
+ ;
+