libressl added to conflict list

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47a04bfaf434..e55907ab7099 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.5.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/openvpn/openvpn
 	arch = x86_64
 	license = custom
@@ -21,6 +21,7 @@ pkgbase = openvpn-xor-git
 	conflicts = openvpn-dev
 	conflicts = openvpn-git
 	conflicts = openvpn-xor-patched
+	conflicts = libressl
 	source = https://github.com/openvpn/openvpn/archive/v2.5.0.tar.gz
 	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.0/patches/02-tunnelblick-openvpn_xorpatch-a.diff
 	source = https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.5.0/patches/03-tunnelblick-openvpn_xorpatch-b.diff
diff --git a/PKGBUILD b/PKGBUILD
index ae28c1f548af..24f6fa949d11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
  # Maintainer: Pete Alexandrou <pete@ozmartians.com>
 pkgname=openvpn-xor-git
 pkgver=2.5.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'
 depends=('openssl' 'lzo' 'iproute2' 'libsystemd' 'pkcs11-helper')
 optdepends=('easy-rsa' 'pam' 'qopenvpn')
 makedepends=('git' 'systemd')
-conflicts=('openvpn' 'openvpn-dev' 'openvpn-git' 'openvpn-xor-patched')
+conflicts=('openvpn' 'openvpn-dev' 'openvpn-git' 'openvpn-xor-patched' 'libressl')
 provides=('openvpn=2.5.0' 'openvpn-dev')
 license=('custom')
 source=("https://github.com/${pkgname%-xor-git}/${pkgname%-xor-git}/archive/v${pkgver}.tar.gz"