From patchwork Fri Nov 15 21:37:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8235 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Xqr2x21K4z3wpd for ; Fri, 15 Nov 2024 21:37:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xqr2w5qR1z1X1; Fri, 15 Nov 2024 21:37:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Xqr2w5FkKz346d; Fri, 15 Nov 2024 21:37:28 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Xqr2t31PVz32sM for ; Fri, 15 Nov 2024 21:37:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Xqr2s5rLhz13c; Fri, 15 Nov 2024 21:37:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1731706645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zHaBxXiyC2KAhUv4EHI5gqdsUgw45Hj79el8bDRnqTw=; b=fPcUcC778KtOGPSTSGPXKBu0pMgEMawm1QmlN2Kwprt8TGxJ3DpzMEWw8z2k/zOd5iuErM 6o6WulZ7n4VFgaAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1731706645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zHaBxXiyC2KAhUv4EHI5gqdsUgw45Hj79el8bDRnqTw=; b=oAZkIhpzS287KDDGCou/ZkOgWH4wcuyDfKWDc8fO9HvH/nZZxEWnL53STKKu/vKxXAQgnR 95YLfNEjKKHMD6f+9YTWlw/gbrphjy8qSgTB08HSSQFVuPfwP8cWT62gFDH3ZtyxMy1Low z2lSvyP4gNai8x1I1+/WXdZGlhkjBsqW/BTgpjZEISDchrTTHhhWlYalrUlcpdztJRPcyl BF23fZ7GRke9DQ+axNkRnCGRAXdOAn4FURkv0Cn+kNkze/Cv4KwEq3TLKBJLjfMVAHUGZn gQ//daa5vVdH7pojVGwlSSHuB2eoP9xiO3TiraEu7eu4IbdO9J6BaG+8ic/1Rw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] elinks: Update to version 0.17.1.1 Date: Fri, 15 Nov 2024 22:37:19 +0100 Message-ID: <20241115213720.899284-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: BQ56HLXIXW52CVCDKZNEYYWP26L3LD6V X-Message-ID-Hash: BQ56HLXIXW52CVCDKZNEYYWP26L3LD6V X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from version 0.16.0 to 0.17.1.1 - Update of rootfile not required - elinks now requires libidn2 as a run time dependency in place of libidn. libidn is also required by ghostscript. If the cups removal patch is accepted, which also removes ghostscript, then at the same time libidn can be removed. - The addition of libidn2 is in another patch combined with this one. - Changelog 0.17.1.1 * bump requirements: libCSS to 0.9.2 and libdom to 0.4.2 * revert "[head] addcrlf". #281 * main, article and nav elements #282 * bashism in configure.ac #285 * eliminate GNUism in sed #305 * python module imp is deprecated #313 * fix hooks.py detection #333 * cast to unsigned char * in inpfield #315 * fix suspend in session master when fork_on_start #296 * remove 300ms startup delay and optimize fork_on_start #297 * missing on systems with musl libc #306 0.17.0 * fix for some 32-bit systems and select-only builds * fix for gettext in Windows builds 0.17.0rc1 * configuration files are now saved to ~/.config/elinks/ or $XDG_CONFIG_HOME/elinks/ #199 User must copy files from ~/.elinks/ to ~/.config/elinks/ himself or herself * HOME_ETC support was dropped, you can set ELINKS_CONFDIR instead * idn2 in place of idn #206 * libcss support (a few netsurf's libraries are required). Set document.css.libcss = 1 to enable * experimental libsixel support (image/*; img2sixel %s; copiousoutput) in ~/.mailcap Must be enabled in a few places in configuration: set document.plain.sixel = 1 and in terminal options. Do not try it on metered remote connections * testing libcurl support (explicit FTPS and SFTP among others) To enable set protocol.ftp.use_curl = 1 set protocol.http.use_curl = 1 for http/https * ui.sessions.postpone_unlink option. Delete temporary files at exit instead of immediately after closing viewer #257 * redefined isspace #249 * Serbian translation update * compilation fixes 0.16.1.1 * updated POTFILES #230 0.16.1 * handle SECTION html element #207 * allocate more memory for BLOCKQUOTE #214 * encode A href to terminal codepage and encode bytes with highest bit set as %HEX #221 * Serbian translation update * install doc by default in meson #224 * tests fixes Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- lfs/elinks | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lfs/elinks b/lfs/elinks index c4b121d6a..bf76343a1 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config SUMMARY = An advanced and well-established feature-rich text mode web browser -VER = 0.16.0 +VER = 0.17.1.1 THISAPP = elinks-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8 +$(DL_FILE)_BLAKE2 = 2158e7630e64977b5250d544159bff0b90953ef7d51870d5e96ce8e36858596e6341bf774ad1717ed4808859d4be316fe75587552e61a8bbfcb00a0366a85e81 install : $(TARGET) @@ -72,11 +72,13 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && meson \ - --prefix=/usr/local \ - -D tre=false \ - -D gpm=false \ - builddir/ + cd $(DIR_APP) && meson setup \ + --prefix=/usr/local \ + -D tre=false \ + -D gpm=false \ + -D libcss=false \ + -D doc=false \ + builddir/ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && ninja -C builddir/ install From patchwork Fri Nov 15 21:37:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8236 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Xqr2x3x4wz3wx3 for ; Fri, 15 Nov 2024 21:37:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xqr2x1ZgYz2Pq; Fri, 15 Nov 2024 21:37:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Xqr2w6c7Pz3496; Fri, 15 Nov 2024 21:37:28 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Xqr2t6WLvz32sM for ; Fri, 15 Nov 2024 21:37:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Xqr2t37fTz13c; Fri, 15 Nov 2024 21:37:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1731706646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K8+jBrja5R2cM0j3nw0HFmR8ktTVuxbvIWX/luw/Xmo=; b=7hwbW0hHVVexuqTwV9gAFZF3BMON5anKafRrpE/O8t56sKoypVn1/GgxuE/IMLzh5q7zJE aKLt4jsTOjy6VYDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1731706646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K8+jBrja5R2cM0j3nw0HFmR8ktTVuxbvIWX/luw/Xmo=; b=b57HqWd6Cv0F/IsIvdQpTJK/m91Lv5jqo+WKUR6WdGB7YTdldyzo9MXqsK9B3AF9xu4JFk l37oeCH/H457Pw/fZwsmS18fQlldfz4O50Cn4amPWmfLx193iyBxDZyHcJzGhB+5sb7N3s LXIB8DPNVZX/v7Dt9gLJ0cQn+6I+saTSZaP/vy87hWMP+AxhIOjAK2/umlz9r+H/Qvs9b8 0q72CxbtrBg4cKSuf7ieCw73pgq5sDHY5xMUWVxzEDJCT8TnfX168BdR3L4Ddg5RFmgnCU mhm8mWSvuAdA/gPpDekG/T9zPae7ztDhIgPAIVziDGJyM98JwZ6z/FFWNZPdow== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] libidn2: Required for elinks in place of libidn Date: Fri, 15 Nov 2024 22:37:20 +0100 Message-ID: <20241115213720.899284-2-adolf.belka@ipfire.org> In-Reply-To: <20241115213720.899284-1-adolf.belka@ipfire.org> References: <20241115213720.899284-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: G7BLTKLETWIQWUXSGG6YRIVFTGYW6FOW X-Message-ID-Hash: G7BLTKLETWIQWUXSGG6YRIVFTGYW6FOW X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Adolf Belka --- config/rootfiles/common/libidn2 | 7 +++ lfs/libidn2 | 82 +++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 90 insertions(+) create mode 100644 config/rootfiles/common/libidn2 create mode 100644 lfs/libidn2 diff --git a/config/rootfiles/common/libidn2 b/config/rootfiles/common/libidn2 new file mode 100644 index 000000000..45a4c84ea --- /dev/null +++ b/config/rootfiles/common/libidn2 @@ -0,0 +1,7 @@ +usr/bin/idn2 +#usr/include/idn2.h +#usr/lib/libidn2.la +#usr/lib/libidn2.so +usr/lib/libidn2.so.0 +usr/lib/libidn2.so.0.4.0 +#usr/lib/pkgconfig/libidn2.pc diff --git a/lfs/libidn2 b/lfs/libidn2 new file mode 100644 index 000000000..b0e51e1e9 --- /dev/null +++ b/lfs/libidn2 @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3.7 + +THISAPP = libidn2-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 40fde88e6be1e4665738855608a65c949834728463a3fb466192403f1076e99f7d399b9631308ff6776a28915251a0136ddfe6a67e8e010c7ccdb7fc64125d39 + + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-nls \ + --disable-doc \ + --disable-static + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 35a602f62..9092b8da9 100755 --- a/make.sh +++ b/make.sh @@ -1659,6 +1659,7 @@ build_system() { lfsmake2 libnet lfsmake2 libnl-3 lfsmake2 libidn + lfsmake2 libidn2 lfsmake2 nasm lfsmake2 libjpeg lfsmake2 openjpeg