From 98573254e171f5de8c91588ea39c4fa2f499e563 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 11 Mar 2023 19:30:30 +0100 Subject: www-client/dillo: Remove last-rited pkg Closes: https://bugs.gentoo.org/804987 Closes: https://bugs.gentoo.org/876286 Closes: https://bugs.gentoo.org/890244 Signed-off-by: David Seifert --- www-client/dillo/Manifest | 3 - www-client/dillo/dillo-3.0.5-r3.ebuild | 68 -------------- www-client/dillo/dillo-3.1_pre20181005.ebuild | 66 -------------- .../dillo/files/dillo-3.0.5-disable-ssl.patch | 22 ----- .../dillo/files/dillo-3.0.5-fno-common.patch | 100 --------------------- .../dillo/files/dillo-3.0.5-openssl-1.1.patch | 26 ------ www-client/dillo/files/dillo2-inbuf.patch | 15 ---- www-client/dillo/metadata.xml | 8 -- 8 files changed, 308 deletions(-) delete mode 100644 www-client/dillo/Manifest delete mode 100644 www-client/dillo/dillo-3.0.5-r3.ebuild delete mode 100644 www-client/dillo/dillo-3.1_pre20181005.ebuild delete mode 100644 www-client/dillo/files/dillo-3.0.5-disable-ssl.patch delete mode 100644 www-client/dillo/files/dillo-3.0.5-fno-common.patch delete mode 100644 www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch delete mode 100644 www-client/dillo/files/dillo2-inbuf.patch delete mode 100644 www-client/dillo/metadata.xml (limited to 'www-client/dillo') diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest deleted file mode 100644 index 94b5f61b5221..000000000000 --- a/www-client/dillo/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild deleted file mode 100644 index ca952fe8090d..000000000000 --- a/www-client/dillo/dillo-3.0.5-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# 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 -} diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild deleted file mode 100644 index b2571abda654..000000000000 --- a/www-client/dillo/dillo-3.1_pre20181005.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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 -} diff --git a/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch b/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch deleted file mode 100644 index de96ea6c1586..000000000000 --- a/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# HG changeset patch -# User Johannes Hofmann -# Date 1612905342 -3600 -# Node ID 67b70f024568b505633524be61fcfbde5337849f -# Parent f60d55c0256759b578b54c577da94670a7737c8a -fix build with --disable-ssl - -submitted-by: John DiMarco - -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) ; - diff --git a/www-client/dillo/files/dillo-3.0.5-fno-common.patch b/www-client/dillo/files/dillo-3.0.5-fno-common.patch deleted file mode 100644 index df80f55afaf8..000000000000 --- a/www-client/dillo/files/dillo-3.0.5-fno-common.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- 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 - #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 diff --git 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 deleted file mode 100644 index f21694113c2b..000000000000 --- a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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; - diff --git a/www-client/dillo/files/dillo2-inbuf.patch b/www-client/dillo/files/dillo2-inbuf.patch deleted file mode 100644 index bc351c252fe6..000000000000 --- a/www-client/dillo/files/dillo2-inbuf.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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; - - diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml deleted file mode 100644 index f55ea9cc39b2..000000000000 --- a/www-client/dillo/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -Enable X11 XEmbed support - - -- cgit v1.2.3-65-gdbad