about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES7
-rw-r--r--PACKAGE/debian/compat2
-rw-r--r--PACKAGE/debian/lynx-dev.lintian-overrides26
-rw-r--r--PACKAGE/debian/postinst27
-rw-r--r--PACKAGE/debian/prerm12
-rwxr-xr-xPACKAGE/debian/rules16
-rw-r--r--PACKAGE/lynx.nsi6
-rw-r--r--PACKAGE/lynx.spec28
-rw-r--r--PACKAGE/version.iss2
-rw-r--r--WWW/Library/Implementation/HTMLGen.c8
-rwxr-xr-xconfigure4
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg4
-rw-r--r--lynx.man5
-rw-r--r--src/LYIcon.rc10
-rw-r--r--userdefs.h4
16 files changed, 64 insertions, 103 deletions
diff --git a/CHANGES b/CHANGES
index 3cd75c2a..17735726 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,12 @@
--- $LynxId: CHANGES,v 1.1161 2024/03/13 16:23:10 tom Exp $
+-- $LynxId: CHANGES,v 1.1165 2024/03/14 14:29:49 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2024-03-13 (2.9.0a)
+2024-03-14 (2.9.0b)
+* update/cleanup test-packages -TD
+* correct logic in HTMLGen.c where XMP was not treated as a preformatted
+  style, causing NNTP headers to be formatted (report by Marco Moock) -TD
 * fix special case of main status line on a page without links, broken by fix
   for UBSAN/ASAN issue -TG
 
diff --git a/PACKAGE/debian/compat b/PACKAGE/debian/compat
index f599e28b..48082f72 100644
--- a/PACKAGE/debian/compat
+++ b/PACKAGE/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/PACKAGE/debian/lynx-dev.lintian-overrides b/PACKAGE/debian/lynx-dev.lintian-overrides
index 9b0aa406..00712a95 100644
--- a/PACKAGE/debian/lynx-dev.lintian-overrides
+++ b/PACKAGE/debian/lynx-dev.lintian-overrides
@@ -1,15 +1,17 @@
-# This is intentional because it is referenced from the documentation.
-lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING
-
-lynx-dev: national-encoding usr/share/doc/lynx-dev/test/ALT88592.html
-lynx-dev: national-encoding usr/share/doc/lynx-dev/test/iso-8859-1.html
-lynx-dev: national-encoding usr/share/doc/lynx-dev/test/iso-8859-2.html
+# These are sample/test-files:
+lynx-dev: national-encoding [usr/share/doc/lynx-dev/test/ALT88592.html]
+lynx-dev: national-encoding [usr/share/doc/lynx-dev/test/iso-8859-1.html]
+lynx-dev: national-encoding [usr/share/doc/lynx-dev/test/iso-8859-2.html]
 
 # These are a known problem with lintian:
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891301
-lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/ALT88592.html [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/)
-lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/bad-html.html [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/)
-lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/cp-1252.html [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/)
-lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/cp-1252a.html [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/)
-lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/iso-8859-2.html [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/)
-lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/iso-8859-2a.html [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/)
+lynx-dev: privacy-breach-generic [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/ALT88592.html]
+lynx-dev: privacy-breach-generic [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/bad-html.html]
+lynx-dev: privacy-breach-generic [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/cp-1252.html]
+lynx-dev: privacy-breach-generic [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/cp-1252a.html]
+lynx-dev: privacy-breach-generic [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/iso-8859-2.html]
+lynx-dev: privacy-breach-generic [<link rev="owner" href="http://mail.gnu.org/mailman/listinfo/lynx-dev/">] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/iso-8859-2a.html]
+
+# These are intentional:
+lynx-dev: extra-license-file [usr/share/doc/lynx-dev/COPYING]
+lynx-dev: spelling-error-in-binary XWINDOWS X [usr/bin/lynx-dev]
diff --git a/PACKAGE/debian/postinst b/PACKAGE/debian/postinst
deleted file mode 100644
index 89955d4a..00000000
--- a/PACKAGE/debian/postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-# postinst script for lynx
-
-set -e
-
-PRI=50
-ALT=lynx
-PKG=lynx-dev
-
-BINDIR=/usr/bin
-MANDIR=/usr/share/man/man1
-
-if [ $1 != "upgrade" ]
-then
-
-	update-alternatives \
-		--install \
-			$BINDIR/$ALT $ALT \
-			$BINDIR/$PKG $PRI \
-		--slave $MANDIR/$ALT.1.gz $ALT.1.gz \
-			$MANDIR/$PKG.1.gz
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/PACKAGE/debian/prerm b/PACKAGE/debian/prerm
deleted file mode 100644
index a79bf385..00000000
--- a/PACKAGE/debian/prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-# prerm script for lynx
-
-set -e
-
-if [ $1 != "upgrade" ]; then
-	update-alternatives --remove lynx /usr/bin/lynx-dev
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/PACKAGE/debian/rules b/PACKAGE/debian/rules
index 908ed5e0..08cabf63 100755
--- a/PACKAGE/debian/rules
+++ b/PACKAGE/debian/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
-# $LynxId: rules,v 1.19 2024/01/15 01:16:07 tom Exp $
+# $LynxId: rules,v 1.24 2024/03/14 13:48:36 tom Exp $
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -20,10 +24,6 @@ helpdir		:= $(docdir)/help_dir
 DSTDIR		:= $(CURDIR)/debian/$(PACKAGE)
 DOCDIR		:= $(DSTDIR)$(docdir)
 
-CPPFLAGS	:= $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS		:= $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS		:= $(shell dpkg-buildflags --get LDFLAGS)
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 DEBOP=--enable-debug
 else
@@ -155,15 +155,15 @@ install-indep:
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_prep -s 
-	dh_installdirs -s
+	dh_prep -a
+	dh_installdirs -a
 
 	$(MAKE) install-full \
 		DESTDIR=$(DSTDIR) \
 		docdir=$(docdir) \
 		helpdir=$(helpdir)
 
-	cd $(DOCDIR) && rm -f COPY*.asc CHANGES 
+	cd $(DOCDIR) && rm -f COPY*.asc CHANGES
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 130b39f9..d1fac90f 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.64 2024/03/13 16:45:26 tom Exp $

+; $LynxId: lynx.nsi,v 1.65 2024/03/14 00:20:31 tom Exp $

 ; Script originally generated with the Venis Install Wizard, but customized.

 ; The Inno Setup script is preferred; but this can be built via cross-compiling.

 

@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "9"

 !define VERSION_MINOR "0"

-!define VERSION_LEVEL "2001"

-!define VERSION_PATCH "a"

+!define VERSION_LEVEL "2002"

+!define VERSION_PATCH "b"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 8806b548..b58a6756 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,25 +1,28 @@
-# $LynxId: lynx.spec,v 1.73 2024/03/13 20:52:04 tom Exp $
+# $LynxId: lynx.spec,v 1.76 2024/03/14 16:57:47 tom Exp $
 Summary: A text-based Web browser
 Name: lynx-dev
 Version: 2.9.1
-Release: 1
+Release: 2
 License: GPLv2
 Group: Applications/Internet
-Source: lynx%{version}.tgz
+Source: https://invisible-island.net/archives/lynx/lynx%{version}.tgz
 URL: https://lynx.invisible-island.net
 Provides: webclient >= 0.0
 Provides: text-www-browser >= 0.0
 
 # Fedora:
-BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5,
+BuildRequires: pkgconfig, ncurses-devel >= 5.3-5,
 BuildRequires: zlib-devel, gettext
 BuildRequires: libidn-devel
+# BuildRequires: openssl-devel
 # BuildRequires: bzip2-devel
 
 # SuSE:
 # BuildRequires: libbz2-devel
+# BuildRequires: libopenssl-1_1-devel, or
+# BuildRequires: libopenssl-3-devel                   
 
-Requires: gzip, bzip2, tar, zip, unzip
+Requires: brotli, gzip, bzip2, tar, zip, unzip
 
 %description
 Lynx is a fully-featured World Wide Web (WWW) client for users running
@@ -48,35 +51,23 @@ HTTP, FTP, WAIS, and NNTP servers.
 	--sysconfdir=%{lynx_etc} \
 	--with-cfg-path=%{lynx_etc}:%{lynx_doc}/samples \
 	--with-textdomain=%{name} \
-	--enable-8bit-toupper \
 	--enable-cgi-links \
 	--enable-change-exec \
 	--enable-charset-choice \
-	--enable-cjk \
 	--enable-default-colors \
 	--enable-exec-links \
 	--enable-exec-scripts \
 	--enable-externs \
 	--enable-font-switch \
-	--enable-forms-options \
 	--enable-gzip-help \
 	--enable-htmlized-cfg \
 	--enable-internal-links \
 	--enable-ipv6 \
-	--enable-chinese-utf8 \
-	--enable-japanese-utf8 \
-	--enable-justify-elts \
 	--enable-kbd-layout \
 	--enable-local-docs \
 	--enable-nested-tables \
 	--enable-nls \
 	--enable-nsl-fork \
-	--enable-partial \
-	--enable-persistent-cookies \
-	--enable-prettysrc \
-	--enable-read-eta \
-	--enable-scrollbar \
-	--enable-source-cache \
 	--enable-syslog \
 	--enable-warnings \
 	--with-screen=ncursesw6dev \
@@ -111,6 +102,9 @@ strip $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %changelog
 
+* Thu Mar 14 2024 Thomas E. Dickey
+- trim redundant options
+
 * Mon Jan 15 2024 Thomas E. Dickey
 - simplified tarball name
 
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 8235a2bd..bab42057 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,6 +1,6 @@
 ; version used for Inno Setup files.

 

-#define LYNX_VERSION "2.9.0a"

+#define LYNX_VERSION "2.9.0b"

 

 #define MyAppProg "Lynx"

 #define MyAppName "Lynx - web browser"

diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index c63723c3..7cf7bb9c 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMLGen.c,v 1.46 2020/01/21 22:02:35 tom Exp $
+ * $LynxId: HTMLGen.c,v 1.47 2024/03/13 23:48:59 tom Exp $
  *
  *		HTML Generator
  *		==============
@@ -160,7 +160,7 @@ static void allow_break(HTStructured * me, int new_cleanness, int dlbc)
  *	------------------
  *
  *	The tricky bits are the line break handling.  This attempts
- *	to synchrononise line breaks on sentence or phrase ends.  This
+ *	to synchronize line breaks on sentence or phrase ends.  This
  *	is important if one stores SGML files in a line-oriented code
  *	repository, so that if a small change is made, line ends don't
  *	shift in a ripple-through to apparently change a large part of the
@@ -466,7 +466,7 @@ static int HTMLGen_start_element(HTStructured * me, int element_number,
     /*
      * Make very specific HTML assumption that PRE can't be nested!
      */
-    me->preformatted = (BOOL) ((element_number == HTML_PRE)
+    me->preformatted = (BOOL) ((element_number == HTML_PRE || element_number == HTML_XMP)
 			       ? YES
 			       : was_preformatted);
 
@@ -538,7 +538,7 @@ static int HTMLGen_end_element(HTStructured * me, int element_number,
     HTMLGen_put_string(me, "</");
     HTMLGen_put_string(me, HTML_dtd.tags[element_number].name);
     HTMLGen_put_character(me, '>');
-    if (element_number == HTML_PRE) {
+    if (element_number == HTML_PRE || element_number == HTML_XMP) {
 	me->preformatted = NO;
     }
 #ifdef USE_COLOR_STYLE
diff --git a/configure b/configure
index 8ccfe0ae..fd60ea7c 100755
--- a/configure
+++ b/configure
@@ -191,8 +191,8 @@ mandir='${datarootdir}/man'
 # Identity of this package.
 PACKAGE_NAME='lynx'
 PACKAGE_TARNAME='lynx'
-PACKAGE_VERSION='2.9.0a'
-PACKAGE_STRING='lynx 2.9.0a'
+PACKAGE_VERSION='2.9.0b'
+PACKAGE_STRING='lynx 2.9.0b'
 PACKAGE_BUGREPORT='lynx-dev@nongnu.org'
 
 ac_prev=
diff --git a/configure.in b/configure.in
index 1e6fe579..335835c1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.356 2024/03/13 19:53:39 tom Exp $
+dnl $LynxId: configure.in,v 1.357 2024/03/14 00:20:31 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -27,10 +27,10 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl ---------------------------------------------------------------------------
 dnl
-AC_REVISION($Revision: 1.356 $)
+AC_REVISION($Revision: 1.357 $)
 
 AC_PREREQ(2.52.20231210)
-AC_INIT(lynx,2.9.0a,lynx-dev@nongnu.org)
+AC_INIT(lynx,2.9.0b,lynx-dev@nongnu.org)
 
 AC_CONFIG_SRCDIR(userdefs.h)
 
diff --git a/lynx.cfg b/lynx.cfg
index aeb1c54f..26862a36 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,9 +1,9 @@
-# $LynxId: lynx.cfg,v 1.337 2024/03/13 20:06:44 tom Exp $
+# $LynxId: lynx.cfg,v 1.338 2024/03/14 00:20:31 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
-# LYNX_VERSION "2.9.0a"
+# LYNX_VERSION "2.9.0b"
 # LYNX_DATE    "13 Mar 2024"
 #
 # Definition pairs (configuration settings) are of the form
diff --git a/lynx.man b/lynx.man
index bb02a349..09410578 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,6 +1,7 @@
-.\" $LynxId: lynx.man,v 1.149 2024/03/13 20:47:12 tom Exp $
+.\" $LynxId: lynx.man,v 1.151 2024/03/14 00:26:03 tom Exp $
 .\" **************************************************************************
-.TH LYNX 1 2024-03-13 "Lynx 2.9.0a" "Lynx \(en the \fItext\fP web browser"
+.TH LYNX 1 2024-03-13 "Lynx 2.9.0b" "Lynx \(en the \fItext\fP web browser"
+.
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index d37abe73..da45f310 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.58 2024/03/13 16:45:26 tom Exp $
+// $LynxId: LYIcon.rc,v 1.59 2024/03/14 00:20:31 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,9,0,2001
-PRODUCTVERSION 2,9,0,2001
+FILEVERSION    2,9,0,2002
+PRODUCTVERSION 2,9,0,2002
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "https://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.9.0.2001"
+      VALUE "FileVersion",      "2.9.0.2002"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2024 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.9.0.2001"
+      VALUE "ProductVersion",   "2.9.0.2002"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/userdefs.h b/userdefs.h
index 5ea3883e..a61aef6f 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.375 2024/03/13 20:06:44 tom Exp $
+ * $LynxId: userdefs.h,v 1.376 2024/03/14 00:20:31 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1451,7 +1451,7 @@
  */
 
 #define LYNX_NAME     "Lynx"
-#define LYNX_VERSION  "2.9.0a"
+#define LYNX_VERSION  "2.9.0b"
 #define LYNX_WWW_HOME "https://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "https://lynx.invisible-island.net/current/"
 #define LYNX_DATE     "13 Mar 2024"
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-02-25 18:06:22 +0000