Preserve: www-client/dillo

2023-03-09 16:20:40 -06:00 · 2023-03-09 16:20:40 -06:00 · 621f7f9eae
commit 621f7f9eae
parent 3cb7cdbaff
8 changed files with 315 additions and 0 deletions
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@ -0,0 +1,10 @@
+AUX dillo-3.0.5-disable-ssl.patch 704 BLAKE2B 77a280559d48fb5312705f706e423ccff2ad399edb2be467ae5ff47d937d943e2325e120916dd1e5616e121780745da2a20a41705aee3f6f0649a56f57ce218e SHA512 06d50336f764abdbee8d1cf5f92a68be46943edbb65f6ceca367929795957bf3b46da8ef3cfc8d45754245049356196c83566d0c9cbea739be96c774ec0e5e31
+AUX dillo-3.0.5-fno-common.patch 2234 BLAKE2B be7c3073e370c8c65fa4cda31739755db678d3dc37564d0635fd03a9fbcdc25f07082a203297c69a74f7557588f7c7149ad59a9ad9a78ab1780a9bc660754259 SHA512 854ee60ecb5b60e5c3f2e5ee22e2e8b29d1ef64052c46055e4a6aa8eafdb31fe7073fec3fda9851de3929c5f73ddc010bf4f2d18cb0036a7df3d453930563000
+AUX dillo-3.0.5-openssl-1.1.patch 806 BLAKE2B 4f7857a6fff86292692d7b7b2c9fc22b11a6db9e5a8f02c6bf43c7f4b6e4575a6cdcde1506ff748f37e1edfc40b06b4f1203b173624a8c6c15230dc2b2a6f3f3 SHA512 c62b9473847cfaee835a1d9c0f83f8b73c05488a0db1ba5fbc3b5719efcd251c2a218221bcb3b8fed1a65feceeefc4c57c31c444fea82a7bf1a12cddbba83af1
+AUX dillo2-inbuf.patch 313 BLAKE2B f3924f38da743bc843142106853b4fc704a9ffc8efe8d74d463fdf09c02bcf7ecff46d04787e7c6fd79a4797c4f239dcd746a73cb47adc36bc6a663169611bde SHA512 d68a21d64eb81341afdccdf1e409e6d12ca88ee2f016b327365b36ff71e015aa38e325b6127f77e45a6d995f38b9a88e90fb375145342fb8d29731ce2105c9ae
+DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a56737dda9d6dcb013f5d46631e4f6f68e251f7104c0ec9bbb14bcc10b67a7f519558f857743d7cf15976f197c SHA512 d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
+DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
+DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
+EBUILD dillo-3.0.5-r3.ebuild 1243 BLAKE2B 14c47e6bc53ce6707b11bd495b357a16428b5201e47d6c0f4c8d55ecb989fdc1989211c0a8bbea27e1b759068695cfe8c8b9ff39ba1689cb9103dcf0eb12509a SHA512 673f5505927ebe591ee182f716da6997d102b4819edc4fb6a0a730c0abcfeb81b619033789ea79f365871cbae978363cfff2c5ff1008e2728df627a7e4d13495
+EBUILD dillo-3.1_pre20181005.ebuild 1267 BLAKE2B d4a031f7b677f4da1f9e50bc581b169204c74d37306aae8ad33386556f6986fde64895b19707c735668bd3c8ec29ae35cd797b165ebc48be2f0b854ddafc08c1 SHA512 cf360030955f38290e02349ee9e9e8958c49b9aefeab0fc5acd2ceb4e511bc5212db16e3e499f95fc09f83c609e7e3ea1085a2d57459d36c3d9ff05db8faeaca
+MISC metadata.xml 234 BLAKE2B 005eb7a48b02fc940cbb0a6295ff7f2af850eeeb2d96ee4c72782c8fb23a3b95d6219536fa2ec47be79553cd2a396a909cd5779526e33faf1d1669aab442a809 SHA512 3f8ddc377f27647b83b0bad68cd3daadcc3a9021c28e05fa32765103d53f0c164436c5265ba4373345fd0fc35db8edc3a5fb2c03884a2a22b14f5086e375206b
--- a/www-client/dillo/dillo-3.0.5-r3.ebuild
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop multilib toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="https://www.dillo.org/"
+SRC_URI="
+	https://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/${PN}.png
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
+IUSE="doc +gif ipv6 +jpeg +png ssl"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}2-inbuf.patch
+	"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+	"${FILESDIR}"/${PN}-3.0.5-openssl-1.1.patch
+)
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf  \
+		$(use_enable gif) \
+		$(use_enable ipv6) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	dodir /etc
+	default
+
+	use doc && dodoc -r html
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Dillo
+}
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="https://www.dillo.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz
+	mirror://gentoo/${PN}.png
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	ssl? ( net-libs/mbedtls:= )
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}2-inbuf.patch
+	"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+	"${FILESDIR}"/${PN}-3.0.5-disable-ssl.patch
+)
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf  \
+		$(use_enable gif) \
+		$(use_enable ipv6) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable ssl) \
+		$(use_enable xembed)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r html
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Dillo
+}
--- a/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch
+++ b/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch
@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User Johannes Hofmann <Johannes.Hofmann@gmx.de>
+# Date 1612905342 -3600
+# Node ID 67b70f024568b505633524be61fcfbde5337849f
+# Parent  f60d55c0256759b578b54c577da94670a7737c8a
+fix build with --disable-ssl
+
+submitted-by: John DiMarco <jdd@cs.toronto.edu>
+
+diff -r f60d55c02567 -r 67b70f024568 src/IO/tls.h
+--- a/src/IO/tls.h	Fri Oct 05 22:05:08 2018 +0200
+++ b/src/IO/tls.h	Tue Feb 09 22:15:42 2021 +0100
+@@ -35,6 +35,7 @@
+ #define a_Tls_connect_ready(url) TLS_CONNECT_NEVER
+ #define a_Tls_reset_server_state(url) ;
+ #define a_Tls_handshake(fd, url) ;
+#define a_Tls_connect(fd, url) ;
+ #define a_Tls_connection(fd) NULL
+ #define a_Tls_freeall() ;
+ #define a_Tls_close_by_fd(fd) ;
+
--- a/www-client/dillo/files/dillo-3.0.5-fno-common.patch
+++ b/www-client/dillo/files/dillo-3.0.5-fno-common.patch
@ -0,0 +1,100 @@
+--- a/dpid/dpid.c
+++ b/dpid/dpid.c
+@@ -41,6 +41,26 @@
+ volatile sig_atomic_t caught_sigchld = 0;
+ char *SharedKey = NULL;
+ 
+char *srs_name;
+
+/*! dpid's service request socket file descriptor */
+int srs_fd;
+
+/*! Number of available plugins */
+int numdpis;
+
+/*! Number of sockets being watched */
+int numsocks;
+
+/*! State information for each plugin. */
+struct dp *dpi_attr_list;
+
+/*! service served for each plugin  */
+Dlist *services_list;
+
+/*! Set of sockets watched for connections */
+fd_set sock_set;
+
+ /*! Remove dpid_comm_keys file.
+  * This avoids that dillo instances connect to a stale port after dpid
+  * has exited (e.g. after a reboot).
+--- 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/dpid_common.c
+++ b/dpid/dpid_common.c
+@@ -14,6 +14,9 @@
+ #include <unistd.h>
+ #include "dpid_common.h"
+ 
+/*! Error codes for dpid */
+dpi_errno_t dpi_errno;
+
+ /*
+  * Send a verbose error message.
+  */
+--- a/dpid/dpid_common.h
+++ b/dpid/dpid_common.h
+@@ -35,12 +35,13 @@
+ #define CKD_WRITE(fd, msg) ckd_write(fd, msg, __FILE__, __LINE__)
+ #define CKD_CLOSE(fd)      ckd_close(fd, __FILE__, __LINE__)
+ 
+-
+ /*! Error codes for dpid */
+-enum {
+typedef enum {
+    no_errors,
+    dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
+} dpi_errno_t;
+
+extern dpi_errno_t dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
--- a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
+++ b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
@ -0,0 +1,26 @@
+--- a/configure.ac
+++ b/configure.ac
+@@ -286,7 +286,7 @@
+ 
+   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_config, ssl_ok=yes, ssl_ok=no, -lcrypto)
+     LIBS="$old_libs"
+   fi
+ 
+--- a/dpi/https.c
+++ b/dpi/https.c
+@@ -476,7 +476,11 @@
+       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;
+
--- a/www-client/dillo/files/dillo2-inbuf.patch
+++ b/www-client/dillo/files/dillo2-inbuf.patch
@ -0,0 +1,15 @@
+--- a/src/form.cc
+++ b/src/form.cc
+@@ -1240,8 +1240,9 @@
+    int rc = 0;
+    Dstr *output;
+    const int bufsize = 128;
+-   inbuf_t *inPtr;
+-   char *buffer, *outPtr;
+   //inbuf_t *inPtr;
+   //char *buffer, *outPtr;
+   char *buffer, *outPtr, *inPtr;
+    size_t inLeft, outRoom;
+    bool bad_chars = false;
+ 
+
--- a/www-client/dillo/metadata.xml
+++ b/www-client/dillo/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+<use>
+<flag name="xembed">Enable X11 XEmbed support</flag>
+</use>
+</pkgmetadata>