From 611d08d4cf01be2f0edce511b839be710fffaef4 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Thu, 26 Jan 2023 11:31:58 +0000
Subject: [PATCH] openvpn: Bump to 2.6.0

---
 root-packages/openvpn/build.sh                | 13 +++++--
 .../src-openvpn-console_builtin.c.patch       | 38 -------------------
 2 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/root-packages/openvpn/build.sh b/root-packages/openvpn/build.sh
index 3eae283a5c..0b544745cc 100644
--- a/root-packages/openvpn/build.sh
+++ b/root-packages/openvpn/build.sh
@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://openvpn.net
 TERMUX_PKG_DESCRIPTION="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
+# License: GPL-2.0-with-OpenSSL-exception
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.5.8
-TERMUX_PKG_SRCURL=https://swupdate.openvpn.net/community/releases/openvpn-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=2bbd0026469902037ee6499b68283d5ab36c74e36cae3112082cfdf6c77a0c57
-TERMUX_PKG_DEPENDS="liblz4, liblzo, net-tools, openssl"
+TERMUX_PKG_VERSION=2.6.0
+TERMUX_PKG_SRCURL=https://github.com/OpenVPN/openvpn/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=31a22d9746b6509c70e4de1be983917425730a4093f43dfe86ff57dc36824a69
+TERMUX_PKG_DEPENDS="libcap-ng, liblz4, liblzo, net-tools, openssl"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -22,6 +23,10 @@ IPROUTE=$TERMUX_PREFIX/bin/ip
 NETSTAT=$TERMUX_PREFIX/bin/netstat
 "
 
+termux_step_pre_configure() {
+	autoreconf -fi
+}
+
 termux_step_post_make_install() {
 	# Examples.
 	install -d -m700 "$TERMUX_PREFIX/share/openvpn/examples"
diff --git a/root-packages/openvpn/src-openvpn-console_builtin.c.patch b/root-packages/openvpn/src-openvpn-console_builtin.c.patch
index 345ff435d1..4ddc798288 100644
--- a/root-packages/openvpn/src-openvpn-console_builtin.c.patch
+++ b/root-packages/openvpn/src-openvpn-console_builtin.c.patch
@@ -10,41 +10,3 @@ diff -uNr openvpn-2.4.7/src/openvpn/console_builtin.c openvpn-2.4.7.mod/src/open
  #ifdef _WIN32
  
  #include "win32.h"
-@@ -138,8 +140,6 @@
- #endif   /* _WIN32 */
- 
- 
--#ifdef HAVE_GETPASS
--
- /**
-  * Open the current console TTY for read/write operations
-  *
-@@ -177,7 +177,6 @@
-     }
- }
- 
--#endif   /* HAVE_GETPASS */
- 
- 
- /**
-@@ -199,10 +198,6 @@
-     ASSERT(capacity > 0);
-     input[0] = '\0';
- 
--#if defined(_WIN32)
--    return get_console_input_win32(prompt, echo, input, capacity);
--#elif defined(HAVE_GETPASS)
--
-     /* did we --daemon'ize before asking for passwords?
-      * (in which case neither stdin or stderr are connected to a tty and
-      * /dev/tty can not be open()ed anymore)
-@@ -247,9 +242,6 @@
-             ret = true;
-         }
-     }
--#else  /* if defined(_WIN32) */
--    msg(M_FATAL, "Sorry, but I can't get console input on this OS (%s)", prompt);
--#endif /* if defined(_WIN32) */
-     return ret;
- }
-