From 41a651c6c5e8f2eae570f15b458caf6fbef7c17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Wed, 3 May 2023 14:05:11 +0200 Subject: [PATCH] fix SIGABRT after start Resolves: rhbz#2185402 --- lynx-2.9.0dev.10-sigabrt-after-start.patch | 20 ++++++++++++++++++++ lynx.spec | 9 ++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 lynx-2.9.0dev.10-sigabrt-after-start.patch diff --git a/lynx-2.9.0dev.10-sigabrt-after-start.patch b/lynx-2.9.0dev.10-sigabrt-after-start.patch new file mode 100644 index 0000000..8fb4f2c --- /dev/null +++ b/lynx-2.9.0dev.10-sigabrt-after-start.patch @@ -0,0 +1,20 @@ +From e54344bd3252108c7c113ea773b3ae9a4e72b427 Mon Sep 17 00:00:00 2001 +From: "Thomas E. Dickey" +Date: Mon, 10 Apr 2023 22:59:30 +0000 +Subject: [PATCH] snapshot of project "lynx", label v2-9-0dev_12c + +Cherry-picked to fix rhbz#2185402. + +Upstream-commit: e54344bd3252108c7c113ea773b3ae9a4e72b427 +Signed-off-by: Lukáš Zaoral + +diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c +@@ -1494,7 +1494,7 @@ static size_t fill_addrinfo(void **buffer, + CTRACE((tfp, "filladdr_info %p\n", (const void *) phost)); + for (q = phost; q != 0; q = q->ai_next) { + ++limit; +- need += phost->ai_addrlen; ++ need += q->ai_addrlen; + need += sizeof(LYNX_ADDRINFO); + } + CTRACE((tfp, "...fill_addrinfo %d:%lu\n", limit, (unsigned long) need)); diff --git a/lynx.spec b/lynx.spec index baf823f..02e50ad 100644 --- a/lynx.spec +++ b/lynx.spec @@ -3,7 +3,7 @@ Summary: A text-based Web browser Name: lynx Version: 2.9.0 -Release: %{devrel}.2%{?dist}.4 +Release: %{devrel}.2%{?dist}.5 License: GPL-2.0-only Source: https://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}%{devrel}.tar.bz2 URL: https://lynx.invisible-island.net/ @@ -25,6 +25,9 @@ Patch3: lynx-2.9.0dev.10-xhtml.patch Patch4: lynx-configure-c99.patch +# lynx: memcpy(): lynx killed by SIGABRT +Patch5: lynx-2.9.0dev.10-sigabrt-after-start.patch + Provides: webclient Provides: text-www-browser BuildRequires: dos2unix @@ -58,6 +61,7 @@ exits quickly and swiftly displays web pages. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} sed -e "s,^HELPFILE:.*,HELPFILE:file://localhost%{_pkgdocdir}/lynx_help/lynx_help_main.html,g" -i lynx.cfg @@ -135,6 +139,9 @@ EOF %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg %changelog +* Wed May 03 2023 Lukáš Zaoral - 2.9.0-dev.10.2.5 +- fix SIGABRT after start (rhbz#2185402) + * Tue Apr 11 2023 Lukáš Zaoral - 2.9.0-dev.10.2.4 - migrate to SPDX license format