updated for Tunnelblick XOR patch scripts updated for 2.4.5 @ upstream

1 files changed, 23 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fde30e27b785..c8d2ffb66de7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
-# Maintainer: Pete Alexandrou <pete@ozmartians.com>
+ # Maintainer: Pete Alexandrou <pete@ozmartians.com>
 pkgname=openvpn-xor-git
-_pkgname=openvpn
 pkgver=2.4.5
-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'
@@ -12,17 +11,12 @@ makedepends=('git' 'systemd')
 conflicts=('openvpn' 'openvpn-dev' 'openvpn-git' 'openvpn-xor-patched')
 provides=('openvpn=2.4.5' '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"
-	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/02-tunnelblick-openvpn_xorpatch-a.diff"
-	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/03-tunnelblick-openvpn_xorpatch-b.diff"
-	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/04-tunnelblick-openvpn_xorpatch-c.diff"
-	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/05-tunnelblick-openvpn_xorpatch-d.diff"
-	    "https://raw.githubusercontent.com/Tunnelblick/Tunnelblick/master/third_party/sources/openvpn/openvpn-2.4.4/patches/06-tunnelblick-openvpn_xorpatch-e.diff"
+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-${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=('ed6390d3dbb540deb40e48d6e1bb5a0912e19314de7f129b998e7e76dff1cc58'
@@ -31,7 +25,7 @@ sha256sums=('ed6390d3dbb540deb40e48d6e1bb5a0912e19314de7f129b998e7e76dff1cc58'
             '6e1d0147076ce0221e4e22e0a10d70c17eaa3740fe21461aff931c107416564f')
 
 prepare() {
-    cd "${_pkgname}-${pkgver}"/
+    cd "${pkgname%-xor-git}-${pkgver}"/
 
     # patch systemd
     git apply "${startdir}/systemd.diff"
@@ -48,7 +42,7 @@ prepare() {
 }
 
 build() {
-    cd "${_pkgname}-${pkgver}"/
+    cd "${pkgname%-xor-git}-${pkgver}"/
 
     autoreconf -vi
 
@@ -65,40 +59,40 @@ build() {
 }
 
 check() {
-	cd "${_pkgname}-${pkgver}"/
+	cd "${pkgname%-xor-git}-${pkgver}"/
 	make check
 }
 
 package() {
-    cd "${_pkgname}-${pkgver}"/
+    cd "${pkgname%-xor-git}-${pkgver}"/
 
     # Install openvpn
     make DESTDIR="${pkgdir}" install
 
     # Create empty configuration directories
-    install -d -m0750 -g 90 "${pkgdir}"/etc/${_pkgname}/{client,server}
+    install -d -m0750 -g 90 "${pkgdir}"/etc/${pkgname%-xor-git}/{client,server}
 
     # Install examples
-    install -d -m0755 "${pkgdir}"/usr/share/${_pkgname}
-    cp -r sample/sample-config-files "${pkgdir}"/usr/share/${_pkgname}/examples
+    install -d -m0755 "${pkgdir}"/usr/share/${pkgname%-xor-git}
+    cp -r sample/sample-config-files "${pkgdir}"/usr/share/${pkgname%-xor-git}/examples
 
     # Install license
-    install -d -m0755 "${pkgdir}"/usr/share/licenses/${_pkgname}/
-    ln -sf /usr/share/doc/${_pkgname}/{COPYING,COPYRIGHT.GPL} "${pkgdir}"/usr/share/licenses/${_pkgname}/
+    install -d -m0755 "${pkgdir}"/usr/share/licenses/${pkgname%-xor-git}/
+    ln -sf /usr/share/doc/${pkgname%-xor-git}/{COPYING,COPYRIGHT.GPL} "${pkgdir}"/usr/share/licenses/${pkgname%-xor-git}/
 
     # Install contrib
     for FILE in $(find contrib -type f); do
     	case "$(file --brief --mime-type "${FILE}")" in
-    		"text/x-shellscript") install -D -m0755 "${FILE}" "${pkgdir}/usr/share/${_pkgname}/${FILE}" ;;
-    		*) install -D -m0644 "${FILE}" "${pkgdir}/usr/share/${_pkgname}/${FILE}" ;;
+    		"text/x-shellscript") install -D -m0755 "${FILE}" "${pkgdir}/usr/share/${pkgname%-xor-git}/${FILE}" ;;
+    		*) install -D -m0644 "${FILE}" "${pkgdir}/usr/share/${pkgname%-xor-git}/${FILE}" ;;
     	esac
     done
 
     # enable scheduling priority changes (nice)
-    sed -i '14s/$/ CAP_SYS_NICE/' "distro/systemd/${_pkgname}-client@.service"
-    sed -i '15s/$/ CAP_SYS_NICE/' "distro/systemd/${_pkgname}-server@.service"
+    sed -i '14s/$/ CAP_SYS_NICE/' "distro/systemd/${pkgname%-xor-git}-client@.service"
+    sed -i '15s/$/ CAP_SYS_NICE/' "distro/systemd/${pkgname%-xor-git}-server@.service"
 
     # Install systemd files
-    install -D -m0644 distro/systemd/${_pkgname}-client@.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-client@.service
-    install -D -m0644 distro/systemd/${_pkgname}-server@.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-server@.service
+    install -D -m0644 distro/systemd/${pkgname%-xor-git}-client@.service ${pkgdir}/usr/lib/systemd/system/${pkgname%-xor-git}-client@.service
+    install -D -m0644 distro/systemd/${pkgname%-xor-git}-server@.service ${pkgdir}/usr/lib/systemd/system/${pkgname%-xor-git}-server@.service
 }