From 5c5e4ef002e34037900fb397da2eed1b30fc05f9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Sep 2025 12:11:26 +0200 Subject: [PATCH] package/dillo: bump to 3.2.0 See here for changes since version 3.0.5: https://dillo-browser.github.io/release/3.1.0/ https://dillo-browser.github.io/release/3.1.1/ https://dillo-browser.github.io/release/3.2.0/ Patches not required anymore. Signed-off-by: Waldemar Brodkorb [Julien: add links to release notes for 3.1.0 and 3.1.1] Signed-off-by: Julien Olivain --- .checkpackageignore | 3 - package/dillo/0001-usr-local-include.patch | 27 ---- .../dillo/0002-Fix-openssl-detection.patch | 29 ---- .../dillo/0003-Support-OpenSSL-1.1.0.patch | 33 ----- .../dillo/0004-fix-build-with-gcc-10.patch | 124 ------------------ package/dillo/dillo.hash | 2 +- package/dillo/dillo.mk | 8 +- 7 files changed, 4 insertions(+), 222 deletions(-) delete mode 100644 package/dillo/0001-usr-local-include.patch delete mode 100644 package/dillo/0002-Fix-openssl-detection.patch delete mode 100644 package/dillo/0003-Support-OpenSSL-1.1.0.patch delete mode 100644 package/dillo/0004-fix-build-with-gcc-10.patch diff --git a/.checkpackageignore b/.checkpackageignore index e5bf14ae73..f45f141d50 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -339,9 +339,6 @@ package/dhcp/S80dhcp-relay Shellcheck lib_sysv.Variables package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables -package/dillo/0001-usr-local-include.patch lib_patch.Upstream -package/dillo/0002-Fix-openssl-detection.patch lib_patch.Upstream -package/dillo/0004-fix-build-with-gcc-10.patch lib_patch.Upstream package/dmalloc/0001-configure-fix-build-on-mips.patch lib_patch.Upstream package/dmalloc/0003-configure-allow-overriding-some-tests.patch lib_patch.Upstream package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch lib_patch.Upstream diff --git a/package/dillo/0001-usr-local-include.patch b/package/dillo/0001-usr-local-include.patch deleted file mode 100644 index 0c3fed2bfa..0000000000 --- a/package/dillo/0001-usr-local-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -Do not add (possibly poisoned) /usr/local/include and /usr/local/lib -to gcc and ld search paths in configure. - -With BR2_COMPILER_PARANOID_UNSAFE_PATH enabled, poisoned paths result -in hard errors, failing affected configure tests. - -Signed-off-by: Alex Suykov - ---- a/configure.ac -+++ b/configure.ac -@@ -57,16 +57,6 @@ - AC_TYPE_INT32_T - AC_TYPE_UINT32_T - --dnl -------------------------------------- --dnl Check whether to add /usr/local or not --dnl (this is somewhat a religious problem) --dnl -------------------------------------- --dnl --if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi -- - dnl ------------------------------------ - dnl Check for socket libs (AIX, Solaris) - dnl ------------------------------------ diff --git a/package/dillo/0002-Fix-openssl-detection.patch b/package/dillo/0002-Fix-openssl-detection.patch deleted file mode 100644 index 6e5f1d021f..0000000000 --- a/package/dillo/0002-Fix-openssl-detection.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 96dde9dedf806256cdc6cbf5cacbd5c8d74e6288 Mon Sep 17 00:00:00 2001 -From: Jonathan Kimmitt -Date: Thu, 9 Jan 2020 22:01:42 +0100 -Subject: [PATCH] Fix openssl detection - -SSL_library_init is now a define, use OPENSSL_init_ssl instead. - -Signed-off-by: Jonathan Kimmitt -Signed-off-by: Peter Seiderer ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 66b5e9f..206fd53 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -276,7 +276,7 @@ if test "x$enable_ssl" = "xyes"; then - - if test "x$ssl_ok" = "xyes"; then - old_libs="$LIBS" -- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto) -+ AC_CHECK_LIB(ssl, OPENSSL_init_ssl, ssl_ok=yes, ssl_ok=no, -lcrypto) - LIBS="$old_libs" - fi - --- -2.24.1 - diff --git a/package/dillo/0003-Support-OpenSSL-1.1.0.patch b/package/dillo/0003-Support-OpenSSL-1.1.0.patch deleted file mode 100644 index 87b9d0dce3..0000000000 --- a/package/dillo/0003-Support-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ff44d8b2d5211a502afdb3e612dae0e8133b5124 Mon Sep 17 00:00:00 2001 -From: Johannes Hofmann -Date: Thu, 9 Jan 2020 22:07:15 +0100 -Subject: [PATCH] Support OpenSSL 1.1.0 - -taken-from: pkgsrc (Ryo ONODERA) -submitted-by: Jun Ebihara - -Upstream: https://hg.dillo.org/dillo/rev/b171b8610400 -Signed-off-by: Peter Seiderer ---- - dpi/https.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dpi/https.c b/dpi/https.c -index 766b3af..025cfc4 100644 ---- a/dpi/https.c -+++ b/dpi/https.c -@@ -476,7 +476,11 @@ static int handle_certificate_problem(SSL * ssl_connection) - case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: - /*Either self signed and untrusted*/ - /*Extract CN from certificate name information*/ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) { -+#else -+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) { -+#endif - strcpy(buf, "(no CN given)"); - } else { - char *cn_end; --- -2.24.1 - diff --git a/package/dillo/0004-fix-build-with-gcc-10.patch b/package/dillo/0004-fix-build-with-gcc-10.patch deleted file mode 100644 index 413bccb00b..0000000000 --- a/package/dillo/0004-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,124 +0,0 @@ -fix build with gcc 10 - -gcc 10 is now defaulting to -fno-common resulting in the following build -failures: - -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -D_FORTIFY_SOURCE=1 -DENABLE_IPV6 -DD_DNS_THREADED -D_REENTRANT -D_THREAD_SAFE -Wall -W -Wno-unused-parameter -Waggregate-return -o dpid dpi.o dpi_socket_dir.o dpid.o dpid_common.o main.o misc_new.o ../dpip/libDpip.a ../dlib/libDlib.a -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: dpi_socket_dir.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: dpid_common.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:64: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:61: multiple definition of `services_list'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:61: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:58: multiple definition of `dpi_attr_list'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:58: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:55: multiple definition of `numsocks'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:55: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:52: multiple definition of `numdpis'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:52: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:31: multiple definition of `srs_fd'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:31: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:28: multiple definition of `srs_name'; dpid.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid.h:28: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: main.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: misc_new.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: multiple definition of `dpi_errno'; dpi.o:/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/dillo-3.0.5/dpid/dpid_common.h:44: first defined here - -So add missing extern for srs_fd, numdpis, numsocks, dpi_attr_list, -services_list and sock_set - -Also remove srs_name which is never used and give a name to dpi_errno -enum - -Fixes: - - http://autobuild.buildroot.org/results/9c777af97fe50143c6a68f0170fc86c87d8ead3f - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to jcid@dillo.org] - -diff -r f60d55c02567 dpid/dpid.c ---- a/dpid/dpid.c Fri Oct 05 22:05:08 2018 +0200 -+++ b/dpid/dpid.c Thu Aug 27 18:16:50 2020 +0200 -@@ -38,6 +38,12 @@ - - #define QUEUE 5 - -+int srs_fd; -+int numdpis; -+int numsocks; -+struct dp *dpi_attr_list; -+Dlist *services_list; -+fd_set sock_set; - volatile sig_atomic_t caught_sigchld = 0; - char *SharedKey = NULL; - -diff -r f60d55c02567 dpid/dpid.h ---- a/dpid/dpid.h Fri Oct 05 22:05:08 2018 +0200 -+++ b/dpid/dpid.h Thu Aug 27 18:16:50 2020 +0200 -@@ -25,10 +25,9 @@ - - /*! \TODO: Should read this from dillorc */ - #define SRS_NAME "dpid.srs" --char *srs_name; - - /*! dpid's service request socket file descriptor */ --int srs_fd; -+extern int srs_fd; - - /*! plugin state information - */ -@@ -49,19 +48,19 @@ - }; - - /*! Number of available plugins */ --int numdpis; -+extern int numdpis; - - /*! Number of sockets being watched */ --int numsocks; -+extern int numsocks; - - /*! State information for each plugin. */ --struct dp *dpi_attr_list; -+extern struct dp *dpi_attr_list; - - /*! service served for each plugin */ --Dlist *services_list; -+extern Dlist *services_list; - - /*! Set of sockets watched for connections */ --fd_set sock_set; -+extern fd_set sock_set; - - /*! Set to 1 by the SIGCHLD handler dpi_sigchld */ - extern volatile sig_atomic_t caught_sigchld; -diff -r f60d55c02567 dpid/dpid_common.h ---- a/dpid/dpid_common.h Fri Oct 05 22:05:08 2018 +0200 -+++ b/dpid/dpid_common.h Thu Aug 27 18:16:50 2020 +0200 -@@ -37,10 +37,10 @@ - - - /*! Error codes for dpid */ --enum { -+enum dpi_errno { - no_errors, - dpid_srs_addrinuse /* dpid service request socket address already in use */ --} dpi_errno; -+}; - - /*! Intended for identifying dillo plugins - * and related files -diff -r f60d55c02567 dpid/main.c ---- a/dpid/main.c Fri Oct 05 22:05:08 2018 +0200 -+++ b/dpid/main.c Thu Aug 27 18:16:50 2020 +0200 -@@ -231,7 +231,7 @@ - /* this sleep used to unmask a race condition */ - // sleep(2); - -- dpi_errno = no_errors; -+ enum dpi_errno error_code = no_errors; - - /* Get list of available dpis */ - numdpis = register_all(&dpi_attr_list); -@@ -254,7 +254,7 @@ - - /* Initialise sockets */ - if ((numsocks = init_ids_srs_socket()) == -1) { -- switch (dpi_errno) { -+ switch (error_code) { - case dpid_srs_addrinuse: - MSG_ERR("dpid refuses to start, possibly because:\n"); - MSG_ERR("\t1) An instance of dpid is already running.\n"); diff --git a/package/dillo/dillo.hash b/package/dillo/dillo.hash index fa46702a63..50559bf857 100644 --- a/package/dillo/dillo.hash +++ b/package/dillo/dillo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b dillo-3.0.5.tar.bz2 +sha256 1066ed42ea7fe0ce19e79becd029c651c15689922de8408e13e70bb5701931bf dillo-3.2.0.tar.bz2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index 802be84717..ce8660c6cb 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -4,22 +4,20 @@ # ################################################################################ -DILLO_VERSION = 3.0.5 +DILLO_VERSION = 3.2.0 DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2 DILLO_SITE = https://github.com/dillo-browser/dillo/releases/download/v$(DILLO_VERSION) DILLO_LICENSE = GPL-3.0+ DILLO_LICENSE_FILES = COPYING -# configure.ac gets patched, so autoreconf is necessary -DILLO_AUTORECONF = YES DILLO_DEPENDENCIES = fltk zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config ifeq ($(BR2_PACKAGE_OPENSSL),y) -DILLO_CONF_OPTS += --enable-ssl +DILLO_CONF_OPTS += --enable-tls DILLO_DEPENDENCIES += openssl else -DILLO_CONF_OPTS += --disable-ssl +DILLO_CONF_OPTS += --disable-tls endif ifeq ($(BR2_PACKAGE_LIBPNG),y)