diff --git a/lynx-2.8.9-build.patch b/lynx-2.8.9-build.patch index 23014a0..bff8088 100644 --- a/lynx-2.8.9-build.patch +++ b/lynx-2.8.9-build.patch @@ -12,7 +12,7 @@ diff --git a/makefile.in b/makefile.in index ad78441..0fd8b1e 100644 --- a/makefile.in +++ b/makefile.in -@@ -109,8 +109,6 @@ COMPRESS_EXT=@COMPRESS_EXT@ +@@ -108,8 +108,6 @@ COMPRESS_EXT=@COMPRESS_EXT@ # Path of scripts directory scripts_dir=$(srcdir)/scripts @@ -21,7 +21,7 @@ index ad78441..0fd8b1e 100644 @LYNXCFG_MAKE@CFG2HTML = alphatoc.html body.html cattoc.html # !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -@@ -215,20 +213,20 @@ binary_PROG = $(actual_PROG)$x +@@ -200,20 +198,20 @@ binary_PROG = $(actual_PROG)$x all lynx$x: cfg_defs.h LYHelp.h @MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c @@ -52,7 +52,7 @@ index ad78441..0fd8b1e 100644 etags: $(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch] -@@ -246,27 +244,27 @@ help: +@@ -231,27 +229,27 @@ help: clean: rm -f WWW/Library/*/*.[aoib] rm -f WWW/Library/*/.created @@ -89,16 +89,16 @@ index ad78441..0fd8b1e 100644 @MSG_DIR_MAKE@ -rmdir $(PO_DIR) -rm -f *~ *.bak *.sav tags TAGS -rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile -@@ -312,7 +310,7 @@ install-full: install install-help install-doc +@@ -297,7 +295,7 @@ install-full: install install-help install-doc @echo Full installation complete. install-bin: $(BINDIR) lynx$x -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) install +@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) install - @ECHO_CC@$(SHELL) -c \ - 'if test -f $(BINDIR)/$(binary_PROG) ; then \ - mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi' -@@ -353,7 +351,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/' + @ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \ + if test -f $(BINDIR)/$$P ; then \ + mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi" +@@ -338,7 +336,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/' @LYNXCFG_MAKE@$(CFG2HTML) : @LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg' @@ -107,7 +107,7 @@ index ad78441..0fd8b1e 100644 @LYNXCFG_MAKE@ @-rm -f $(CFG2HTML) @LYNXCFG_MAKE@ sed -n -e '/Config_Type *Config_Table/,/{0, *0, *0}/ p' $(SRC_DIR)/LYReadCFG.i | \ @LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \ -@@ -451,7 +449,7 @@ install-lss : $(SYSCONFDIR) +@@ -436,7 +434,7 @@ install-lss : $(SYSCONFDIR) @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss uninstall :: @@ -116,7 +116,7 @@ index ad78441..0fd8b1e 100644 -rm -f $(BINDIR)/$(binary_PROG) -rm -f $(MANDIR)/$(actual_PROG).1 -rm -f $(SYSCONFDIR)/lynx.cfg -@@ -484,7 +482,7 @@ uninstall-doc :: +@@ -469,7 +467,7 @@ uninstall-doc :: update-po: rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) diff --git a/lynx-2.8.9-redhat.patch b/lynx-2.8.9-redhat.patch index 8cdce92..50db79f 100644 --- a/lynx-2.8.9-redhat.patch +++ b/lynx-2.8.9-redhat.patch @@ -13,7 +13,7 @@ index f01782f..ccc0846 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,7 +1,9 @@ - # $LynxId: lynx.cfg,v 1.288 2017/07/11 08:45:14 tom Exp $ + # $LynxId: lynx.cfg,v 1.297 2018/05/07 23:37: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) @@ -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.8.9dev.16" + #PRCS LYNX_VERSION "2.8.9dev.19" @@ -108,7 +110,7 @@ # # Normally we expect you will connect to a remote site, e.g., the Lynx starting @@ -70,7 +70,7 @@ index f01782f..ccc0846 100644 .h1 Interaction .h2 NO_DOT_FILES -@@ -3447,6 +3452,7 @@ COLOR:6:brightred:black +@@ -3451,6 +3456,7 @@ COLOR:6:brightred:black #ENABLE_LYNXRC:VI_KEYS:ON #ENABLE_LYNXRC:VISITED_LINKS:ON .fi diff --git a/lynx-CVE-2008-4690.patch b/lynx-CVE-2008-4690.patch index a0a6a32..a9e58a7 100644 --- a/lynx-CVE-2008-4690.patch +++ b/lynx-CVE-2008-4690.patch @@ -16,7 +16,7 @@ diff --git a/CHANGES b/CHANGES index 360be68..8eca013 100644 --- a/CHANGES +++ b/CHANGES -@@ -1237,6 +1237,13 @@ Changes since Lynx 2.8 release +@@ -1349,6 +1349,13 @@ Changes since Lynx 2.8 release * update win32 makefiles/build scripts to add LYmktime, parsdate modules -TD * update config.guess (2008-04-14), config.sub (2008-06-16) @@ -34,7 +34,7 @@ diff --git a/lynx.cfg b/lynx.cfg index ee2aad3..144050d 100644 --- a/lynx.cfg +++ b/lynx.cfg -@@ -1087,7 +1087,7 @@ CHARACTER_SET:utf-8 +@@ -1087,7 +1087,7 @@ LOCALE_CHARSET:TRUE # # The default TRUSTED_LYNXCGI rule is "none". # diff --git a/lynx.spec b/lynx.spec index b478360..47b4186 100644 --- a/lynx.spec +++ b/lynx.spec @@ -1,9 +1,9 @@ -%global devrel 16 +%global devrel 19 Summary: A text-based Web browser Name: lynx Version: 2.8.9 -Release: 0.22.dev%{devrel}%{?dist} +Release: 0.23.dev%{devrel}%{?dist} License: GPLv2 Group: Applications/Internet Source: https://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}dev.%{devrel}.tar.bz2 @@ -131,6 +131,9 @@ EOF %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg %changelog +* Wed May 23 2018 Kamil Dudka - 2.8.9-0.23.dev19 +- update to the latest upstream pre-release + * Mon Feb 19 2018 Kamil Dudka - 2.8.9-0.22.dev16 - add explicit BR for the gcc compiler diff --git a/lynx2.8.9dev.16.tar.bz2.asc b/lynx2.8.9dev.16.tar.bz2.asc deleted file mode 100644 index dc2a977..0000000 --- a/lynx2.8.9dev.16.tar.bz2.asc +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) -Comment: See http://invisible-island.net/public/public.html for info - -iEYEABECAAYFAllleFUACgkQcCNT4PfkjtvWEACfcedy16v8tap/wu+W0vomvXzb -U1gAoLkyPwAfsmKF52j0wtA+oOkFWNoH -=s+SC ------END PGP SIGNATURE----- diff --git a/lynx2.8.9dev.19.tar.bz2.asc b/lynx2.8.9dev.19.tar.bz2.asc new file mode 100644 index 0000000..f3431f3 --- /dev/null +++ b/lynx2.8.9dev.19.tar.bz2.asc @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 +Comment: See https://invisible-island.net/public/public.html for info + +iEYEABECAAYFAlr+I0cACgkQcCNT4PfkjtsIIwCePCaoWSdUW6Ms90m4PQwa3Glv +wFAAn2PCQeobm6oONhtOUG9QlQ/iyhhV +=w0tm +-----END PGP SIGNATURE----- diff --git a/sources b/sources index aac1b49..5dc2bc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lynx2.8.9dev.16.tar.bz2) = 6aa5e869924c6e42aa68113985aecfb75dc6eb68d5d7db8cedb9843621d29c36c17078e7a692f472e3e7f1edf7ca666e3614bc3bdb092a3631877733d5e3d518 +SHA512 (lynx2.8.9dev.19.tar.bz2) = 8afe781af8409b92dec8f1f0026a8a35ce7295d9b9c51360724dfd108047cf5823e8982c21634a2422c93ec14b0b51bdd6e3ec2dd37d446269afd95505c39843