summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPete Alexandrou2023-02-20 19:24:55 +1100
committerPete Alexandrou2023-02-20 19:24:55 +1100
commitbc793f01299b66fc579a65e888a577f239212084 (patch)
tree3cf3c7c859fabc8ddad6c5c93aa426ce5bbd086f
parent7080d0748d084e7e9632bc03ec78ef35172ff3bd (diff)
downloadaur-bc793f01299b66fc579a65e888a577f239212084.tar.gz
fixed [XOR] watermark for 2.6.0 changes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--openvpn-xor-watermark.diff10
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3c69a39134b7..ea319693e8ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
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.6.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/openvpn/openvpn
arch = x86_64
license = custom
@@ -44,6 +44,6 @@ pkgbase = openvpn-xor-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 6e1d0147076ce0221e4e22e0a10d70c17eaa3740fe21461aff931c107416564f
- sha256sums = 1f3455ed9dbfa7e98799e5e5c7ca1cdeee0745f2759db8eb8111142a9eff73ac
+ sha256sums = 3f69857f9b2c27c3a391a4592b6a264d4cffe4d35166f1fcdfddac632f2b7970
pkgname = openvpn-xor-git
diff --git a/PKGBUILD b/PKGBUILD
index ad784d45c381..3df120bfc633 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Pete Alexandrou <pete@ozmartians.com>
pkgname=openvpn-xor-git
pkgver=2.6.0
-pkgrel=1
+pkgrel=2
pkgdesc='OpenVPN with XOR patch to bypass DPI monitoring in places like China (also known as OpenVPN stealth/scramble mode)'
arch=('x86_64')
url='https://github.com/openvpn/openvpn'
@@ -23,7 +23,7 @@ source=("https://github.com/${pkgname%-xor-git}/${pkgname%-xor-git}/archive/v${p
sha256sums=('31a22d9746b6509c70e4de1be983917425730a4093f43dfe86ff57dc36824a69'
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
'6e1d0147076ce0221e4e22e0a10d70c17eaa3740fe21461aff931c107416564f'
- '1f3455ed9dbfa7e98799e5e5c7ca1cdeee0745f2759db8eb8111142a9eff73ac')
+ '3f69857f9b2c27c3a391a4592b6a264d4cffe4d35166f1fcdfddac632f2b7970')
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 bc163579ae76..4695824b1e6b 100644
--- a/openvpn-xor-watermark.diff
+++ b/openvpn-xor-watermark.diff
@@ -1,8 +1,10 @@
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
-@@ -109,3 +109,4 @@ const char title_string[] =
+@@ -107,6 +107,7 @@ const char title_string[] =
+ #endif
+ #endif
" [AEAD]"
+ " [XOR]"
- " built on " __DATE__
- ;
-
+ #ifdef ENABLE_DCO
+ " [DCO]"
+ #endif