From nobody Wed Nov 16 15:34:51 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NC6YS0vtZz4dKcV; Wed, 16 Nov 2022 15:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NC6YS0NbQz4bQ4; Wed, 16 Nov 2022 15:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668612892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkN52OiggQeMDCyC7sjLhcbjah0Y0FL3frVO2alq/6I=; b=PDTcEXFtJYzskZKXItivMMG0xYgwVxg/j/gqRSdQ03zA49AYBW2sWRTasVA/cYfe+mF4oJ jsXUEtiH3zP5gVeBbtA3fUDtrg7yPirV1y9FeVfHg9q+xqLo1x/JjHPFg1UykU1vCuG4Ut cTo9rIkq+Wd+Pa6HkwztmTSg7mRFXXNJrzYUSs6xOZFPuDv5fYfZ63BWCR3dtJGcoeTYT9 O9MNDvgs7ZI0PDO332YG/dICizKasSKO+m8fxQwQiHoxv2fxWkCPHWceXfz8QxxaueBOWh 72KokOH6/OZ78MrhL12v/WtuzLyiyiA3fCAOz+0EUXq3Y/ctJGlNp9KInadlcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668612892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkN52OiggQeMDCyC7sjLhcbjah0Y0FL3frVO2alq/6I=; b=SJZRnzyjGkLXsNE3XvYUgycmIIKkPZG4GNsIakNl1mzrmsy9YM2AtqpuuArKHpg3fz/cEU 1gRj+4QjWenjC5gALWj98NSKysleVlwM58vyXGWxieVnN1CHJmqW049H8ntrSHfkMkjB/R Dyn2H8sOgWyem997mIuZF9jpdlbDsCNNbyOpfEr1Xm6t3J3ye0L3PMbTdYscieNzXiqWZS ULQ9Cvf8HGAXzghPFTxT4tWyfXMldm/6Afk9I/5A1FC4zF66QssYN+U1gD9QnZb4V7NXRB PUtd3tc4TEekZNuZgjODaNP40jYZDDwMx/HomK6SOpoo0zT+V8WkjglY/8smCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668612892; a=rsa-sha256; cv=none; b=ahPka5OgFtuvsfOLwMq7+SdV4Fo2jW/T0IWebc8JlRntvNkq6xm3aEBDihkXp2nedmBwbX nroMJcmuxQD+SAZ78b/j8VdDA14gKnn9dNZNybO81zW/njLuAJbL/ljXxy8qWwkAZGvQpQ hs1ozJ0R0QYyE2j7Ylbc4sdPk6kbAz6c1EcRWyylVfXVWsStirlbrNyFnemBqfEUL1UrOw bYmXvroLXMSHngcd1ndIRuV199sb20iNQC7G2AeKj7j+EnrjGZNqhdQgsZiBbOmFVzhGJr 7VGrKB7AzbDNTKxKufTkejL7WNmEN6Kt5LRJ5epUNv/2wfSB6Lx3d7FfyZbH0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NC6YR6JmDz16m7; Wed, 16 Nov 2022 15:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AGFYpc2093548; Wed, 16 Nov 2022 15:34:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AGFYpDg093547; Wed, 16 Nov 2022 15:34:51 GMT (envelope-from git) Date: Wed, 16 Nov 2022 15:34:51 GMT Message-Id: <202211161534.2AGFYpDg093547@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 6b82b9945652 - main - www/elinks: fix detection of execinfo List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b82b9945652f28f4245dd2e2662af401cda0534 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b82b9945652f28f4245dd2e2662af401cda0534 commit 6b82b9945652f28f4245dd2e2662af401cda0534 Author: Baptiste Daroussin AuthorDate: 2022-11-16 15:30:51 +0000 Commit: Baptiste Daroussin CommitDate: 2022-11-16 15:34:49 +0000 www/elinks: fix detection of execinfo When moving from autotools to autotools to meson, the check from the execinfo header was lost, readd this test. When execinfo is not detected, the replacement code instead of error is an abusive end less loop, while here patch out this part [1]. Note that upstream merge the removal of the code. While here remove a useless macro which wasn't functional anyway due to a typo PR: 267794 [1] Submitted by: Dustin Marquess [1] --- www/elinks/Makefile | 2 +- www/elinks/files/patch-meson.build | 11 +++++++++++ www/elinks/files/patch-src_util_error.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 30b5c821a985..320097115d5d 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,6 +1,7 @@ PORTNAME= elinks DISTVERSIONPREFIX= v DISTVERSION= 0.15.1 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= jailbird@fdf.net @@ -17,7 +18,6 @@ USE_GITHUB= yes GH_ACCOUNT= rkd77 LIBS+= -lexecinfo -CONIGURE_ENV= PYTHON_PATH="${PYTHON_CMD}" MESON_ARGS= -Dgpm=false -Dperl=true OPTIONS_DEFINE= 256COLORS 88COLORS TRUECOLORS BITTORRENT BROTLI EXMODE \ diff --git a/www/elinks/files/patch-meson.build b/www/elinks/files/patch-meson.build index dd8549a15b67..77b35a8981b2 100644 --- a/www/elinks/files/patch-meson.build +++ b/www/elinks/files/patch-meson.build @@ -11,3 +11,14 @@ conf_data = configuration_data() conf_data.set('VERSION', meson.project_version()) +@@ -158,6 +156,10 @@ if compiler.has_header('fcntl.h') + + if compiler.has_header('fcntl.h') + conf_data.set('HAVE_FCNTL_H', 1) ++endif ++ ++if compiler.has_header('execinfo.h') ++ conf_data.set('HAVE_EXECINFO_H', 1) + endif + + if compiler.has_header('libgen.h') diff --git a/www/elinks/files/patch-src_util_error.c b/www/elinks/files/patch-src_util_error.c new file mode 100644 index 000000000000..30424736bf20 --- /dev/null +++ b/www/elinks/files/patch-src_util_error.c @@ -0,0 +1,29 @@ +--- src/util/error.c.orig 2022-07-31 10:16:29 UTC ++++ src/util/error.c +@@ -301,26 +301,6 @@ dump_backtrace(FILE *f, int trouble) + fprintf(f, "[%p] %s\n", stack[i], strings[i]); + + free(strings); +- +-#else +- /* User torturation. */ +- /* You are worried about what you see here? You don't see anything in +- * the first place. Also, be assured that we know what are we doing. */ +- /* (We are killing the user, obviously.) */ +- +- /* TODO: Gettextify? Er, better not. More people (translators) could +- * find out what are we doing... ;-) --pasky */ +- /* TODO: Be more cruel when in trouble? ;-) --pasky */ +- +- fputs( "Wheeeeeeeeeee! You played with the config.h by hand, didn't you?\n" +- "Of _COURSE_ you did! Is that how a nice .. creature behaves like?\n" +- "Of _COURSE_ it isn't! I feel offended and thus I will revenge now!\n" +- "You will _suffer_ >:).\n" +- "\n" +- "CPU burning sequence initiated...\n", f); +- +- /* TODO: Include cpuburn.c here. --pasky */ +- while (1); + #endif + fflush(f); + }