update to new upstream release

- %%{gpgverify} sources
- remove upstreamed patches
- use compressed man pages
This commit is contained in:
Lukáš Zaoral 2023-05-03 10:18:14 +02:00
parent 41a651c6c5
commit 71b8050272
No known key found for this signature in database
GPG Key ID: 39157506DD67752D
8 changed files with 67 additions and 259 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/lynx2.*.tar.bz2
/lynx2.*.tar.bz2.asc

View File

@ -0,0 +1,42 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
P46cd3aSov0rfNS/zg==
=cr15
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
From bccfb8ac43da56cb1f53c4b421e09dcac1fd1af0 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 13 Feb 2013 15:17:08 +0100
Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.8.9
Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.9.0dev.12
---
lynx.cfg | 18 ++++++++++++------
@ -13,7 +13,7 @@ index f01782f..ccc0846 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,7 +1,9 @@
# $LynxId: lynx.cfg,v 1.324 2021/08/11 10:25:15 tom Exp $
# $LynxId: lynx.cfg,v 1.330 2023/01/02 23:50:09 tom Exp $
# lynx.cfg file.
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
-# or Lynx_Dir:lynx.cfg (VMS)
@ -23,7 +23,7 @@ index f01782f..ccc0846 100644
+# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg.
#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
#PRCS LYNX_VERSION "2.9.0dev.10"
#PRCS LYNX_VERSION "2.9.0dev.12"
@@ -108,7 +110,7 @@
#
# Normally we expect you will connect to a remote site, e.g., the Lynx starting

View File

@ -1,165 +0,0 @@
From efc075db2309c3dee59b80b6a8488d5f429c0297 Mon Sep 17 00:00:00 2001
From: "Thomas E. Dickey" <dickey@invisible-island.net>
Date: Mon, 13 Jun 2022 00:23:57 +0000
Subject: [PATCH] add presentation type for xhtml
...related state information to better handle things
such as "<script src=foo />" -Sholmi Fish, TD
snapshot of project "lynx", label v2-9-0dev_10h
Upstream-commit: 6308534d913fccf7c0a17d592b9584e15fac455c
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
WWW/Library/Implementation/SGML.c | 16 +++++++++++-----
WWW/Library/Implementation/SGML.h | 4 +++-
src/HTInit.c | 2 +-
src/HTML.c | 18 ++++++++++++++----
src/HTML.h | 5 +++++
5 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index d120644..e211b2a 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1621,7 +1621,8 @@ static BOOL ignore_when_empty(HTTag * tag)
&& !(tag->flags & Tgf_mafse)
&& tag->contents != SGML_EMPTY
&& tag->tagclass != Tgc_Plike
- && (tag->tagclass == Tgc_SELECTlike
+ && (tag->tagclass == Tgc_APPLETlike
+ || tag->tagclass == Tgc_SELECTlike
|| (tag->contains && tag->icontains))) {
result = TRUE;
}
@@ -3644,9 +3645,9 @@ static void SGML_character(HTStream *me, int c_in)
case S_attr:
if (WHITE(c) || (c == '>') || (c == '=')) { /* End of word */
if ((c == '>')
- && (string->size == 1)
- && (string->data[0] == '/')) {
- if (me->extended_html
+ && (string->size >= 1)
+ && (string->data[string->size - 1] == '/')) {
+ if ((LYxhtml_parsing || me->extended_html)
&& ignore_when_empty(me->current_tag)) {
discard_empty(me);
}
@@ -4590,7 +4591,8 @@ const HTStreamClass SGMLParser =
HTStream *SGML_new(const SGML_dtd * dtd,
HTParentAnchor *anchor,
- HTStructured * target)
+ HTStructured * target,
+ int extended_html)
{
HTStream *me = typecalloc(struct _HTStream);
@@ -4660,6 +4662,10 @@ HTStream *SGML_new(const SGML_dtd * dtd,
sgml_in_psrc_was_initialized = TRUE;
}
#endif
+ if (extended_html)
+ {
+ me->extended_html = TRUE;
+ }
sgml_offset = 0;
return me;
diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h
index 8b6445f..2ddef5f 100644
--- a/WWW/Library/Implementation/SGML.h
+++ b/WWW/Library/Implementation/SGML.h
@@ -281,7 +281,9 @@ Create an SGML parser
*/
extern HTStream *SGML_new(const SGML_dtd * dtd,
HTParentAnchor *anchor,
- HTStructured * target);
+ HTStructured * target,
+ int extended_html)
+ ;
extern const HTStreamClass SGMLParser;
diff --git a/src/HTInit.c b/src/HTInit.c
index c451762..bd41dee 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -178,7 +178,7 @@ void HTFormatInit(void)
* application/xhtml+xml
* text/html
*/
- SET_INTERNL("application/xhtml+xml", "www/present", HTMLPresent, 1.0);
+ SET_INTERNL("application/xhtml+xml", "www/present", XHTMLPresent, 1.0);
SET_INTERNL("application/xhtml+xml", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("text/css", "www/present", HTPlainPresent, 1.0);
SET_INTERNL(STR_HTML, "www/present", HTMLPresent, 1.0);
diff --git a/src/HTML.c b/src/HTML.c
index a012466..9ec15c2 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -7957,7 +7957,7 @@ HTStream *HTMLToPlain(HTPresentation *pres,
CTRACE((tfp, "HTMLToPlain calling CacheThru_new\n"));
return CacheThru_new(anchor,
SGML_new(&HTML_dtd, anchor,
- HTML_new(anchor, pres->rep_out, sink)));
+ HTML_new(anchor, pres->rep_out, sink), FALSE));
}
/* HTConverter for HTML source to plain text
@@ -8020,7 +8020,7 @@ HTStream *HTMLParsedPresent(HTPresentation *pres,
CTRACE((tfp, "HTMLParsedPresent calling CacheThru_new\n"));
return CacheThru_new(anchor,
SGML_new(&HTML_dtd, anchor,
- HTMLGenerator(intermediate)));
+ HTMLGenerator(intermediate), FALSE));
}
/* HTConverter for HTML to C code
@@ -8048,7 +8048,7 @@ HTStream *HTMLToC(HTPresentation *pres GCC_UNUSED,
HTML_put_string(html, html->comment_start);
CTRACE((tfp, "HTMLToC calling CacheThru_new\n"));
return CacheThru_new(anchor,
- SGML_new(&HTML_dtd, anchor, html));
+ SGML_new(&HTML_dtd, anchor, html, FALSE));
}
/* Presenter for HTML
@@ -8067,7 +8067,17 @@ HTStream *HTMLPresent(HTPresentation *pres GCC_UNUSED,
CTRACE((tfp, "HTMLPresent calling CacheThru_new\n"));
return CacheThru_new(anchor,
SGML_new(&HTML_dtd, anchor,
- HTML_new(anchor, WWW_PRESENT, NULL)));
+ HTML_new(anchor, WWW_PRESENT, NULL), FALSE));
+}
+
+HTStream *XHTMLPresent(HTPresentation *pres GCC_UNUSED,
+ HTParentAnchor *anchor,
+ HTStream *sink GCC_UNUSED)
+{
+ CTRACE((tfp, "XHTMLPresent calling CacheThru_new\n"));
+ return CacheThru_new(anchor,
+ SGML_new(&HTML_dtd, anchor,
+ HTML_new(anchor, WWW_PRESENT, NULL), TRUE));
}
#endif /* !GUI */
diff --git a/src/HTML.h b/src/HTML.h
index 9f5d1d5..0baa23e 100644
--- a/src/HTML.h
+++ b/src/HTML.h
@@ -251,6 +251,11 @@ extern "C" {
HTParentAnchor *anchor,
HTStream *sink);
+ extern HTStream *XHTMLPresent(HTPresentation *pres,
+ HTParentAnchor *anchor,
+ HTStream *sink);
+
+
extern HTStructured *HTML_new(HTParentAnchor *anchor,
HTFormat format_out,
HTStream *target);
--
2.35.3

View File

@ -1,57 +0,0 @@
The HAVE_UNISTD_H change only shows up in configure because it's a fix
for shell code generated by an old autoconf release.
Submitted upstream:
<https://lists.nongnu.org/archive/html/lynx-dev/2022-12/msg00000.html>
diff --git a/aclocal.m4 b/aclocal.m4
index 70cde243d2129cc0..bf2cbff661de2fe1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6435,6 +6435,7 @@ AC_CACHE_CHECK(if we can include termio.h with curses,cf_cv_termio_and_curses,[
CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation"
touch lynx_cfg.h
AC_TRY_COMPILE([
+#include <stdio.h>
#include <$1>
#include <termio.h>],
[putchar(0x0a)],
@@ -6455,6 +6456,7 @@ AC_DEFUN([CF_TERMIO_AND_TERMIOS],
AC_MSG_CHECKING([termio.h and termios.h])
AC_CACHE_VAL(cf_cv_termio_and_termios,[
AC_TRY_COMPILE([
+#include <stdio.h>
#if HAVE_TERMIO_H
#include <termio.h>
#endif
diff --git a/configure b/configure
index 97f6d1d5646d05c5..6db52b514b3b9a3c 100755
--- a/configure
+++ b/configure
@@ -31122,6 +31122,7 @@ else
#line 31122 "configure"
#include "confdefs.h"
+#include <stdio.h>
#if HAVE_TERMIO_H
#include <termio.h>
#endif
@@ -31629,6 +31630,9 @@ else
#line 31629 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <sys/types.h>
#define NGID 256
#undef MAX
@@ -47492,6 +47496,7 @@ else
#line 47492 "configure"
#include "confdefs.h"
+#include <stdio.h>
#include <LYCurses.h>
#include <termio.h>
int

View File

@ -1,11 +1,15 @@
%global devrel dev.10
%global devrel dev.12
Summary: A text-based Web browser
Name: lynx
Version: 2.9.0
Release: %{devrel}.2%{?dist}.5
Release: %{devrel}.1%{?dist}
License: GPL-2.0-only
Source: https://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}%{devrel}.tar.bz2
Source0: https://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}%{devrel}.tar.bz2
Source1: https://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}%{devrel}.tar.bz2.asc
Source2: https://invisible-island.net/public/dickey@invisible-island.net-rsa3072.asc
URL: https://lynx.invisible-island.net/
# RH specific tweaks - directory layout, utf-8 by default, misc. configuration
@ -20,19 +24,15 @@ Patch1: lynx-2.8.9-build.patch
# [CVE-2008-4690]
Patch2: lynx-CVE-2008-4690.patch
# add presentation type for xhtml
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
Patch3: lynx-2.9.0dev.10-sigabrt-after-start.patch
Provides: webclient
Provides: text-www-browser
BuildRequires: dos2unix
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: gnupg2
BuildRequires: libidn2-devel
BuildRequires: make
BuildRequires: ncurses-devel
@ -54,14 +54,8 @@ advantage Lynx has over graphical browsers is speed; Lynx starts and
exits quickly and swiftly displays web pages.
%prep
%setup -q -n lynx%{version}%{devrel}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1 -n lynx%{version}%{devrel}
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
sed -e "s,^HELPFILE:.*,HELPFILE:file://localhost%{_pkgdocdir}/lynx_help/lynx_help_main.html,g" -i lynx.cfg
@ -81,6 +75,7 @@ sed -e 's,^STARTFILE:.*,STARTFILE:file:/usr/share/doc/HTML/en-US/index.html,' -i
--enable-default-colors \
--enable-externs \
--enable-file-upload \
--enable-gzip-help \
--enable-internal-links \
--enable-ipv6 \
--enable-japanese-utf8 \
@ -133,12 +128,18 @@ EOF
%doc docs README INSTALLATION samples
%doc test lynx.hlp lynx_help
%{_bindir}/lynx
%{_mandir}/*/*
%{_mandir}/man1/lynx.1.*
%config(noreplace) %{_sysconfdir}/lynx.cfg
%config(noreplace) %{_sysconfdir}/lynx.lss
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
%changelog
* Wed May 03 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.0-dev.12.1
- %%{gpgverify} sources
- remove upstreamed patches
- update to new upstream release
- use compressed man pages
* Wed May 03 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.0-dev.10.2.5
- fix SIGABRT after start (rhbz#2185402)

View File

@ -1,15 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Comment: See https://invisible-island.net/public/public.html for info
iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmF5CpYACgkQzCr0RyFn
vgPb3AwApLCyrCzsOo74wHmf5xhWgnY2i4STXTTjhqx8v64vCZ3Bz/97u7bfi2Th
kPP2I4q3D7/6njgpVyjLuyocOXYWd8obrwKS+bit9o8u6cDpPLumkt4DwDi/HNSS
evJvlFCyR6bK/+0nNcOPrmWNg+jZ+2cJJzHcorNG0rDHVrKsOAUJKnHZ3Cc2ZSXL
hIm2V4nnsBuZIbrX48AtKjUwrpG5uI49F6BBjMc7FPhHfeudI9ZWOsktDzQxIWHZ
sHGVaV4S6uX4jNSG7xbapxKnwvGppRKcDrWZ0uQHx/Cq/AaE9EAuHGWvYkBNdalP
dpRnToMa7od5mL9bfQVEWK8cRH9Zp1k+nm+FIACAFlXo3wzSLg+D369AvRLR8Bk/
5ZN6gT+ZzzAdo9TPv9pHw/KRlT31ECEcLjH3r3K2aV3NKMLOMTNlR3F2i/8+voSo
YHXk/96r0a7hVLUkHsJa6kf6P/dyncSMQnYVSXHkM74aIG3u5OpBBbfQCz7GaCDS
C/ZS/mTD
=GWXu
-----END PGP SIGNATURE-----

View File

@ -1 +1,2 @@
SHA512 (lynx2.9.0dev.10.tar.bz2) = afc8bbd241045a530d2c869b268fce708077024fea4363902d258a174994424e6cc64f066c63db82f08bb7e368647cbed1d420d596a494982f09ae05ec9e8bf5
SHA512 (lynx2.9.0dev.12.tar.bz2) = 9dd85d335a0b2c4c28f362cbcbe6499662696286fcc78e827bfafe2787d4a7fcd3faec78a115df8c14ea6e4314a5ea272f5b6353cb13224ecaebb61ae271701b
SHA512 (lynx2.9.0dev.12.tar.bz2.asc) = fecfcbbf41f83285019a93b59d3ee38263aa0b8fc03914d41af1f9f3f77e1e376c8c686754d3e1a777d6aa853b4f3cfdca5d2a4ffa2ab3fe6ae4952e61a22e16