From b5a0e75ccb7dfa278d83169d6dcfd1869967fceb Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Wed, 11 Jan 2023 08:44:41 +0900
Subject: [PATCH] edbrowse: Bump to 3.8.6

---
 packages/edbrowse/LICENSE.quickjs             | 22 +++++++++++++++++++
 packages/edbrowse/build.sh                    | 15 ++++++++-----
 .../{makefile.patch => src-makefile.patch}    |  8 +++----
 3 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 packages/edbrowse/LICENSE.quickjs
 rename packages/edbrowse/{makefile.patch => src-makefile.patch} (58%)

diff --git a/packages/edbrowse/LICENSE.quickjs b/packages/edbrowse/LICENSE.quickjs
new file mode 100644
index 0000000000..2c8fdebaff
--- /dev/null
+++ b/packages/edbrowse/LICENSE.quickjs
@@ -0,0 +1,22 @@
+QuickJS Javascript Engine
+ 
+Copyright (c) 2017-2021 Fabrice Bellard
+Copyright (c) 2017-2021 Charlie Gordon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/packages/edbrowse/build.sh b/packages/edbrowse/build.sh
index c6923a7e98..6ef6c177b7 100644
--- a/packages/edbrowse/build.sh
+++ b/packages/edbrowse/build.sh
@@ -1,15 +1,20 @@
 TERMUX_PKG_HOMEPAGE=https://edbrowse.org/
 TERMUX_PKG_DESCRIPTION="Line based editor, browser, and mail client"
-TERMUX_PKG_LICENSE="GPL-2.0, MIT, MPL-2.0"
-TERMUX_PKG_LICENSE_FILE="COPYING"
+# License: GPL-2.0-or-later
+TERMUX_PKG_LICENSE="GPL-2.0, MIT"
+TERMUX_PKG_LICENSE_FILE="COPYING, LICENSE.quickjs"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3.8.5
+TERMUX_PKG_VERSION=3.8.6
 TERMUX_PKG_SRCURL=https://github.com/CMB/edbrowse/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=4fb6ce7962560552b370c55467dc65f6d751de06ba373ac7c4678625daed37b4
-TERMUX_PKG_DEPENDS="libandroid-glob, libcurl, pcre2, readline, unixodbc"
+TERMUX_PKG_SHA256=85ce43c2832e1e79ea24e23c7726757080ef966d7c2c387f8aa9be108f36bf26
+TERMUX_PKG_DEPENDS="libandroid-glob, libcurl, openssl, pcre2, readline, unixodbc"
 TERMUX_PKG_BUILD_DEPENDS="quickjs"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="-C src
 PREFIX=$TERMUX_PREFIX
 QUICKJS_DIR=$TERMUX_PREFIX/include/quickjs
 "
+
+termux_step_post_get_source() {
+	cp $TERMUX_PKG_BUILDER_DIR/LICENSE.quickjs ./
+}
diff --git a/packages/edbrowse/makefile.patch b/packages/edbrowse/src-makefile.patch
similarity index 58%
rename from packages/edbrowse/makefile.patch
rename to packages/edbrowse/src-makefile.patch
index f27e762b27..23c7c75473 100644
--- a/packages/edbrowse/makefile.patch
+++ b/packages/edbrowse/src-makefile.patch
@@ -1,11 +1,11 @@
---- src/src/makefile	2021-04-07 15:57:51.000000000 +0000
-+++ src/src/makefile	2021-10-03 18:58:49.577709943 +0000
+--- a/src/makefile
++++ b/src/makefile
 @@ -31,10 +31,10 @@
  CFLAGS += $(DEBUGFLAGS)
  
  #  Libraries and linker flags for edbrowse.
--LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
-+LDFLAGS += $(STRIP) $(LINKER_LIBS) -landroid-glob -lm
+-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm -lssl -lcrypto
++LDFLAGS = $(STRIP) $(LINKER_LIBS) -landroid-glob -lm -lssl -lcrypto
  
  # LDFLAGS for quickjs loading.
 -QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl