Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (992b78e075d5225977e8624a9fc298aab67cb96d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (992b78e075d5225977e8624a9fc298aab67cb96d)
  • Date: Thu, 13 Jun 2024 11:40:50 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

http/dillo/DEPENDS | 23 +++----
http/dillo/DETAILS | 18 +----
http/dillo/HISTORY | 9 ++
http/dillo/PREPARE | 3
http/dillo/PRE_BUILD | 7 --
http/dillo/patches/fix-OpenSSL-1.1-detection.patch | 68
---------------------
utils/libtree/DETAILS | 1
7 files changed, 27 insertions(+), 102 deletions(-)

New commits:
commit 992b78e075d5225977e8624a9fc298aab67cb96d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo 3.1.1

commit 58c41acf37dbc3cd27408f4e6277d038fc4f7006
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo: Remove (dead) hg scm branch

commit 9754099e1841c7766f961ef63c9f2df936fa235d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo: Update website

commit c4b4afd054242fa7c2f9419d22d61cacef5490cc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo: Add Watch line

commit 08e3d3f2a89dca328f884b90546aa20b382e003c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libtree: Add Watch line

diff --git a/http/dillo/DEPENDS b/http/dillo/DEPENDS
index 1c6d7c1..c08edba 100755
--- a/http/dillo/DEPENDS
+++ b/http/dillo/DEPENDS
@@ -1,16 +1,17 @@
-if [[ "$DILLO_BRANCH" == "scm" ]]; then
-depends libtool &&
-depends automake &&
-depends autoconf &&
-depends mercurial
-fi &&
-
depends fltk &&
depends wget &&
-optional_depends "SSL" \
- "--enable-ssl" \
- "--disable-ssl" \
- "for SSL support" &&
+
+optional_depends SSL \
+ --enable-openssl \
+ --disable-openssl \
+ "for TLS support with OpenSSL/LibreSSL (preferred)" &&
+
+if is_depends_enabled "$SPELL" SSL; then
+ optional_depends mbedtls \
+ --enable-mbedtls \
+ --disable-tls \
+ "for TLS support with mbedtls"
+fi &&

optional_depends "JPEG" \
"--enable-jpeg" \
diff --git a/http/dillo/DETAILS b/http/dillo/DETAILS
index f6929e0..5f30ace 100755
--- a/http/dillo/DETAILS
+++ b/http/dillo/DETAILS
@@ -1,21 +1,13 @@
+# Watch: https://dillo-browser.github.io/release/latest/
. "$GRIMOIRE/FUNCTIONS"
SPELL=dillo
-if [[ "$DILLO_BRANCH" == "scm" ]]; then
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-hg.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
- SOURCE_URL[0]=hg_http://hg.dillo.org/$SPELL:$SPELL-hg
- SOURCE_IGNORE=volatile
-else
- VERSION=3.0.5
+ VERSION=3.1.1
SOURCE=dillo-$VERSION.tar.bz2
- SOURCE_URL[0]=http://www.dillo.org/download/$SOURCE
+
SOURCE_URL[0]=https://github.com/dillo-browser/dillo/releases/download/v$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/dillo-$VERSION
-
SOURCE_HASH=sha512:d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
-fi
+
SOURCE_HASH=sha512:2f6ad315c246638e91af13fbeb8a846b756c222aaf2275efb1bff6bae08130bb4b8fda9c09cd33925911c424fe536cf7a587e6657de9a13d63733714c86533c1
LICENSE[0]=GPL
- WEB_SITE=http://dillo.org
+ WEB_SITE=https://dillo-browser.github.io/
ENTERED=20080826
KEYWORDS="http"
SHORT="dillo2 is the experimental fltk2 port of dillo"
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 73dcfa5..62f9b71 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,11 @@
+2024-06-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated website
+ * DEPENDS, DETAILS, PREPARE: removed scm branch (the hg repo is dead)
+ * PRE_BUILD, patches/fix-OpenSSL-1.1-detection.patch:
+ removed, no longer needed
+ * DEPENDS, DETAILS, PRE_BUILD: updated spell to 3.1.1
+ added mbedtls fallback dependency
+
2022-11-08 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Use -fcommon instead of -Wl,--allow-multiple-definition

@@ -148,4 +156,3 @@

2002-03-13 Eric Schabell <eric AT schabell.com>
* HISTORY: Added this History file.
-
diff --git a/http/dillo/PREPARE b/http/dillo/PREPARE
index 53a4552..c419ff0 100755
--- a/http/dillo/PREPARE
+++ b/http/dillo/PREPARE
@@ -1,2 +1 @@
-. "$GRIMOIRE"/FUNCTIONS &&
-prepare_select_branch stable scm
+persistent_remove DILLO_BRANCH DILLO_CVS
diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
deleted file mode 100755
index b90c44a..0000000
--- a/http/dillo/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-if [[ "$DILLO_CVS" == "y" ]]; then
- ./autogen.sh
-fi &&
-apply_patch_dir patches &&
-sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/http/dillo/patches/fix-OpenSSL-1.1-detection.patch
b/http/dillo/patches/fix-OpenSSL-1.1-detection.patch
deleted file mode 100644
index c38d5d3..0000000
--- a/http/dillo/patches/fix-OpenSSL-1.1-detection.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
-Bug-Debian: https://bugs.debian.org/845035
-Author: Axel Beckert <abe AT debian.org>
-Forwarded:
http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
-
-[ismael AT sourcemage.org: Edited to remove redundant cast]
-
---- a/configure 2015-06-30 16:07:22.000000000 +0200
-+++ b/configure 2015-06-30 16:07:22.000000000 +0200
-@@ -6002,9 +6002,9 @@
-
- if test "x$ssl_ok" = "xyes"; then
- old_libs="$LIBS"
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init
in -lssl" >&5
--$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
--if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl"
>&5
-+$as_echo_n "checking for SSL_new in -lssl... " >&6; }
-+if ${ac_cv_lib_ssl_SSL_new+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -6018,27 +6018,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char SSL_library_init ();
-+char SSL_new ();
- int
- main ()
- {
--return SSL_library_init ();
-+return SSL_new ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_ssl_SSL_library_init=yes
-+ ac_cv_lib_ssl_SSL_new=yes
- else
-- ac_cv_lib_ssl_SSL_library_init=no
-+ ac_cv_lib_ssl_SSL_new=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_ssl_SSL_library_init" >&5
--$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
--if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
-+$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
-+if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
- ssl_ok=yes
- else
- ssl_ok=no
---- a/dpi/https.c
-+++ b/dpi/https.c
-@@ -476,7 +476,7 @@
- case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- /*Either self signed and untrusted*/
- /*Extract CN from certificate name information*/
-- if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
-+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) ==
NULL) {
- strcpy(buf, "(no CN given)");
- } else {
- char *cn_end;
diff --git a/utils/libtree/DETAILS b/utils/libtree/DETAILS
index 1cc54a5..bf73596 100755
--- a/utils/libtree/DETAILS
+++ b/utils/libtree/DETAILS
@@ -1,3 +1,4 @@
+# Watch: https://github.com/haampie/libtree/tags /refs/tags/v([0-9.]+)[.]tar
SPELL=libtree
VERSION=3.1.1
SOURCE="$SPELL-$VERSION.tar.gz"


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (992b78e075d5225977e8624a9fc298aab67cb96d), Ismael Luceno, 06/13/2024

Archive powered by MHonArc 2.6.24.

Top of Page