From 8e342f22e8b6e7c4c86d3d94625a00a61116ae59 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 21:36:21 +0200 Subject: Merging upstream version 2.9.1. Signed-off-by: Daniel Baumann --- PACKAGE/debian/changelog | 6 +++--- PACKAGE/debian/compat | 2 +- PACKAGE/debian/lynx-dev.lintian-overrides | 26 ++++++++++++++------------ PACKAGE/debian/postinst | 27 --------------------------- PACKAGE/debian/prerm | 12 ------------ PACKAGE/debian/rules | 16 ++++++++-------- PACKAGE/lynx-curssl.iss | 14 -------------- PACKAGE/lynx.iss | 20 ++++++++++---------- PACKAGE/lynx.nsi | 8 ++++---- PACKAGE/lynx.spec | 30 ++++++++++++------------------ PACKAGE/version.iss | 2 +- 11 files changed, 53 insertions(+), 110 deletions(-) delete mode 100644 PACKAGE/debian/postinst delete mode 100644 PACKAGE/debian/prerm delete mode 100644 PACKAGE/lynx-curssl.iss (limited to 'PACKAGE') diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog index 048e3cf..69e763e 100644 --- a/PACKAGE/debian/changelog +++ b/PACKAGE/debian/changelog @@ -1,8 +1,8 @@ -lynx-dev (2.9.0) unstable; urgency=high +lynx-dev (2.9.1) unstable; urgency=low - * new release + * maintenance updates - -- Thomas E. Dickey Sun, 14 Jan 2024 17:15:53 -0500 + -- Thomas E. Dickey Wed, 13 Mar 2024 12:45:26 -0400 lynx-dev (2.8.8dev.16) unstable; urgency=high diff --git a/PACKAGE/debian/compat b/PACKAGE/debian/compat index f599e28..48082f7 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 9b0aa40..00712a9 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 [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/bad-html.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/cp-1252.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/cp-1252a.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/iso-8859-2.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/iso-8859-2a.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/ALT88592.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/bad-html.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/cp-1252.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/cp-1252a.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/iso-8859-2.html] +lynx-dev: privacy-breach-generic [] (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 89955d4..0000000 --- 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 a79bf38..0000000 --- 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 908ed5e..08cabf6 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-curssl.iss b/PACKAGE/lynx-curssl.iss deleted file mode 100644 index 3182257..0000000 --- a/PACKAGE/lynx-curssl.iss +++ /dev/null @@ -1,14 +0,0 @@ -; $LynxId: lynx-curssl.iss,v 1.1 2022/12/29 00:38:46 tom Exp $ -; -; This is an installer for Lynx built with "current" OpenSSL (3.0.x). -; -; The script assumes environment variables have been set, e.g., to point to -; data which is used by the installer (see "lynx.lss" for details). - -#define NoScreenDll -#define SslGlob1 "'libssl-3*.dll'" -#define SslGlob2 "'libcrypto-3*.dll'" -#define SetupBaseName "lynx-curssl" -#define SourceExeName "lynx-curssl.exe" - -#include "lynx.iss" diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss index 2353067..385b51c 100644 --- a/PACKAGE/lynx.iss +++ b/PACKAGE/lynx.iss @@ -1,4 +1,4 @@ -; $LynxId: lynx.iss,v 1.41 2024/01/15 23:28:41 tom Exp $ +; $LynxId: lynx.iss,v 1.42 2024/04/14 23:28:50 tom Exp $ ; vile:ts=4 sw=4 notabinsert fk=8bit ; ; This is the BASE script for different flavors of the installer for Lynx. @@ -95,7 +95,7 @@ AppCopyright= AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} +DefaultDirName={commonpf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes LicenseFile=..\COPYHEADER @@ -176,7 +176,7 @@ Type: dirifempty; Name: {app} function isGuru(): Boolean; begin - Result := isAdminLoggedOn(); + Result := isAdmin(); end; function environRootKey(): Integer; @@ -232,7 +232,7 @@ end; function selectedVarsRootKey(): Integer; begin - if isTaskSelected('for_all_users') then + if WizardisTaskSelected('for_all_users') then Result := HKEY_LOCAL_MACHINE else Result := HKEY_CURRENT_USER; @@ -240,15 +240,15 @@ end; function selectedVarsSubKey(): String; begin - if isTaskSelected('for_all_users') then + if WizardisTaskSelected('for_all_users') then begin - if isTaskSelected('register_vars') then + if WizardisTaskSelected('register_vars') then Result := appSubKey() else Result := envSysKey(); end else begin - if isTaskSelected('register_vars') then + if WizardisTaskSelected('register_vars') then Result := appSubKey() else Result := envSubKey(); @@ -308,13 +308,13 @@ begin if not RegWriteStringValue(selectedVarsRootKey(), Keypath, '', AppDir) then Log('Failed to set key'); - if isTaskSelected('use_sendto') then + if WizardisTaskSelected('use_sendto') then begin AddSendTo(); Log('** added Send-To link'); end; - if isTaskSelected('quicklaunchicon') then + if WizardisTaskSelected('quicklaunchicon') then begin AddQuickLaunch(); Log('** added Quick-launch link'); @@ -346,7 +346,7 @@ begin Log('** customized ' + CfgFile); - if isTaskSelected('use_sendto') then + if WizardisTaskSelected('use_sendto') then begin AddSendTo(); Log('** added Send-To link'); diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi index 7071db2..90817f6 100644 --- a/PACKAGE/lynx.nsi +++ b/PACKAGE/lynx.nsi @@ -1,4 +1,4 @@ -; $LynxId: lynx.nsi,v 1.63 2024/01/07 11:13:00 tom Exp $ +; $LynxId: lynx.nsi,v 1.72 2024/04/15 20:53:51 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. @@ -8,9 +8,9 @@ !define VERSION_EPOCH "2" !define VERSION_MAJOR "9" -!define VERSION_MINOR "0" -!define VERSION_LEVEL "1013" -!define VERSION_PATCH "dev.13" +!define VERSION_MINOR "1" +!define VERSION_LEVEL "0" +!define VERSION_PATCH "" !define SUBKEY "Lynx" diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec index a11a9a0..7f23f19 100644 --- a/PACKAGE/lynx.spec +++ b/PACKAGE/lynx.spec @@ -1,25 +1,28 @@ -# $LynxId: lynx.spec,v 1.72 2024/01/15 11:47:26 tom Exp $ +# $LynxId: lynx.spec,v 1.83 2024/04/15 20:53:51 tom Exp $ Summary: A text-based Web browser Name: lynx-dev -Version: 2.9.0 -Release: 1 +Version: 2.9.1 +Release: 0 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 e3fe613..92b4e90 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -1,6 +1,6 @@ ; version used for Inno Setup files. -#define LYNX_VERSION "2.9.0" +#define LYNX_VERSION "2.9.1" #define MyAppProg "Lynx" #define MyAppName "Lynx - web browser" -- cgit v1.2.3