dillo: update to 3.1.0.

srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch

@@ -1,80 +0,0 @@
-Description: Fix FTBFS with gcc-10
-Bug-Debian: https://bugs.debian.org/957136
-Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
-Author: Axel Beckert <abe@debian.org>
-Forwarded: no
-
---- a/dpid/dpid.h
-+++ b/dpid/dpid.h
-@@ -25,10 +25,10 @@
- 
- /*! \TODO: Should read this from dillorc */
- #define SRS_NAME "dpid.srs"
--char *srs_name;
-+extern char *srs_name;
- 
- /*! dpid's service request socket file descriptor */
--int srs_fd;
-+extern int srs_fd;
- 
- /*! plugin state information
-  */
-@@ -49,19 +49,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;
---- a/dpid/main.c
-+++ b/dpid/main.c
-@@ -31,6 +31,17 @@
- #include "../dpip/dpip.h"
- 
- sigset_t mask_sigchld;
-+char *srs_name;
-+int srs_fd;
-+int numdpis;
-+int numsocks;
-+struct dp *dpi_attr_list;
-+Dlist *services_list;
-+fd_set sock_set;
-+enum {
-+   no_errors,
-+   dpid_srs_addrinuse /* dpid service request socket address already in use */
-+} dpi_errno;
- 
- 
- /* Start a dpi filter plugin after accepting the pending connection
---- a/dpid/dpid_common.h
-+++ b/dpid/dpid_common.h
-@@ -38,10 +38,7 @@
- 
- 
- /*! Error codes for dpid */
--enum {
--   no_errors,
--   dpid_srs_addrinuse /* dpid service request socket address already in use */
--} dpi_errno;
-+extern enum dpi_errno;
- 
- /*! Intended for identifying dillo plugins
-  * and related files

srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch

@@ -1,66 +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@debian.org>
-Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
-
---- 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((X509 *) remote_cert), "/CN=")) == NULL) {
-             strcpy(buf, "(no CN given)");
-          } else {
-             char *cn_end;

srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

@@ -1,16 +0,0 @@
-Description: Fix DuckDuckGo shortcut to make result links working
-Bug-Debian: https://bugs.debian/org/924357
-Forwarded: no
-Author: liftof+dbug@gmail.com
-
---- a/dillorc
-+++ b/dillorc
-@@ -157,7 +157,7 @@
- # You can enable multiple search_url strings at once and select from among
- # them at runtime, with the first being the default.
- # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
--search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
-+search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
- search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
- search_url="Free Dictionary http://www.thefreedictionary.com/%s"
- search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"

srcpkgs/dillo/template

@@ -1,17 +1,18 @@
 # Template file for 'dillo'
 pkgname=dillo
-version=3.0.5
+version=3.1.0
-revision=14
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
+configure_args="--enable-tls --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
+hostmakedepends="which"
 makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.dillo.org/download/"
-distfiles="https://web.archive.org/web/20210410093347/https://www.dillo.org/download/dillo-${version}.tar.bz2"
+distfiles="https://github.com/dillo-browser/dillo/releases/download/v${version}/dillo-${version}.tar.gz"
-checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
+checksum=bb627c976350c3aa8aa82aefcd34b931bb32d1fa52541f145a6837acf1b992b0