rpms/lynx
5
0
Fork 0
Code Issues Pull Requests Releases Activity

resync patches against 2.9.0dev.10

Browse Source
This commit is contained in:
Thomas E. Dickey 2022-01-07 15:03:27 -05:00
parent e2044f18cf
commit 7fef638783
No known key found for this signature in database
GPG Key ID: CC2AF4472167BE03
3 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
lynx-2.8.9-build.patch
View File

@ -21,115 +21,115 @@ index ad78441..0fd8b1e 100644
@LYNXCFG_MAKE@CFG2HTML = alphatoc.html body.html cattoc.html @LYNXCFG_MAKE@CFG2HTML = alphatoc.html body.html cattoc.html
# !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -200,20 +198,20 @@ binary_PROG = $(actual_PROG)$x @@ -199,20 +197,20 @@ binary_PROG = $(actual_PROG)$x
all lynx$x: cfg_defs.h LYHelp.h all lynx$x: cfg_defs.h LYHelp.h
@MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c @MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) -@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) )
- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) - ( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) )
- cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS) - ( cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS) )
- cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS) - ( cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS) )
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) +@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) )
+ $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) + ( $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) )
+ $(MAKE) -C $(CHR_DIR) all $(CHR_CFLAGS) + ( $(MAKE) -C $(CHR_DIR) all $(CHR_CFLAGS) )
+ $(MAKE) -C $(SRC_DIR) all $(SRC_CFLAGS) + ( $(MAKE) -C $(SRC_DIR) all $(SRC_CFLAGS) )
lint: lint:
- cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ - ( cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ )
- cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@ - ( cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@ )
- cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@ - ( cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@ )
+ $(MAKE) -C $(WWW_DIR) LINT="$(LINT)" $(WWW_CFLAGS) $@ + ( $(MAKE) -C $(WWW_DIR) LINT="$(LINT)" $(WWW_CFLAGS) $@ )
+ $(MAKE) -C $(SRC_DIR) LINT="$(LINT)" $(SRC_CFLAGS) $@ + ( $(MAKE) -C $(SRC_DIR) LINT="$(LINT)" $(SRC_CFLAGS) $@ )
+ $(MAKE) -C $(CHR_DIR) LINT="$(LINT)" $@ + ( $(MAKE) -C $(CHR_DIR) LINT="$(LINT)" $@ )
tags: tags:
- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@ - ( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@ )
- cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@ - ( cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@ )
- cd $(CHR_DIR) && $(MAKE_RECUR) $@ - ( cd $(CHR_DIR) && $(MAKE_RECUR) $@ )
+ $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) $@ + ( $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) $@ )
+ $(MAKE) -C $(SRC_DIR) $(SRC_CFLAGS) $@ + ( $(MAKE) -C $(SRC_DIR) $(SRC_CFLAGS) $@ )
+ $(MAKE) -C $(CHR_DIR) $@ + ( $(MAKE) -C $(CHR_DIR) $@ )
etags: etags:
$(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch] $(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch]
@@ -231,27 +229,27 @@ help: @@ -233,27 +231,27 @@ help:
clean: clean:
rm -f WWW/Library/*/*.[aoib] rm -f WWW/Library/*/*.[aoib]
rm -f WWW/Library/*/.created rm -f WWW/Library/*/.created
- cd $(WWW_DIR) && $(MAKE_RECUR) $@ - ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
- cd $(SRC_DIR) && $(MAKE_RECUR) $@ - ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
+ $(MAKE) -C $(WWW_DIR) $@ + ( $(MAKE) -C $(WWW_DIR) $@ )
+ $(MAKE) -C $(SRC_DIR) $@ + ( $(MAKE) -C $(SRC_DIR) $@ )
@MSG_DIR_MAKE@ rm -f LYMessages.c @MSG_DIR_MAKE@ rm -f LYMessages.c
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@ -@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) $@ )
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@ +@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) $@ )
rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.* rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
@LYNXCFG_MAKE@ -rm -f $(CFG2HTML) @LYNXCFG_MAKE@ -rm -f $(CFG2HTML)
rm -f help_files.sed rm -f help_files.sed
rm -f core *.core rm -f core *.core
depend: cfg_defs.h LYHelp.h depend: cfg_defs.h LYHelp.h
- cd $(WWW_DIR) && $(MAKE_RECUR) $@ - ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
- cd $(SRC_DIR) && $(MAKE_RECUR) $@ - ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
+ $(MAKE) -C $(WWW_DIR) $@ + ( $(MAKE) -C $(WWW_DIR) $@ )
+ $(MAKE) -C $(SRC_DIR) $@ + ( $(MAKE) -C $(SRC_DIR) $@ )
distclean: clean distclean: clean
-rm -f WWW/Library/*/*~ -rm -f WWW/Library/*/*~
-rm -f WWW/Library/*/*.bak -rm -f WWW/Library/*/*.bak
-rm -rf $(SRC_DIR)/obsolete -rm -rf $(SRC_DIR)/obsolete
- -cd $(WWW_DIR) && $(MAKE_RECUR) $@ - -( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
- -cd $(SRC_DIR) && $(MAKE_RECUR) $@ - -( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
- -cd $(CHR_DIR) && $(MAKE_RECUR) $@ - -( cd $(CHR_DIR) && $(MAKE_RECUR) $@ )
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@ -@MSG_DIR_MAKE@ -( cd $(PO_DIR) && $(MAKE_RECUR) $@ )
+ -$(MAKE) -C $(WWW_DIR) $@ + -( $(MAKE) -C $(WWW_DIR) $@ )
+ -$(MAKE) -C $(SRC_DIR) $@ + -( $(MAKE) -C $(SRC_DIR) $@ )
+ -$(MAKE) -C $(CHR_DIR) $@ + -( $(MAKE) -C $(CHR_DIR) $@ )
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@ +@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) $@ )
@MSG_DIR_MAKE@ -rmdir $(PO_DIR) @MSG_DIR_MAKE@ -rmdir $(PO_DIR)
-rm -f *~ *.bak *.sav tags TAGS -rm -f *~ *.bak *.sav tags TAGS
-rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile -rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile
@@ -297,7 +295,7 @@ install-full: install install-help install-doc @@ -299,7 +297,7 @@ install-full: install install-help install-doc
@echo Full installation complete. @echo "Full installation complete."
install-bin: $(BINDIR) lynx$x install-bin: $(BINDIR) lynx$x
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) install -@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) install )
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) install +@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) install )
@ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \ @ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \
if test -f $(BINDIR)/$$P ; then \ if test -f $(BINDIR)/$$P ; then \
mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi" mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"; \
@@ -338,7 +336,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/' @@ -350,7 +348,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/'
@LYNXCFG_MAKE@@MAKE_PHONY@$(CFG2HTML): htmlized_cfg
@LYNXCFG_MAKE@$(CFG2HTML) : @LYNXCFG_MAKE@@MAKE_PHONY@htmlized_cfg:
@LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg' @LYNXCFG_MAKE@ @echo "Making htmlized lynx.cfg"
-@LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i -@LYNXCFG_MAKE@ ( cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i )
+@LYNXCFG_MAKE@ $(MAKE) -C $(SRC_DIR) LYReadCFG.i +@LYNXCFG_MAKE@ ( $(MAKE) -C $(SRC_DIR) LYReadCFG.i )
@LYNXCFG_MAKE@ @-rm -f $(CFG2HTML) @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 -n -e '/Config_Type *Config_Table/,/{0, *0, *0}/ p' $(SRC_DIR)/LYReadCFG.i | \
@LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \ @LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \
@@ -436,7 +434,7 @@ install-lss : $(SYSCONFDIR) @@ -448,7 +446,7 @@ install-lss : $(SYSCONFDIR)
@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
uninstall :: uninstall ::
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall -@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) uninstall )
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) uninstall +@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) uninstall )
-rm -f $(BINDIR)/$(binary_PROG) -rm -f $(BINDIR)/$(binary_PROG) ;\
-rm -f $(MANDIR)/$(actual_PROG).1 rm -f $(MANDIR)/$(actual_PROG).1 ;\
-rm -f $(SYSCONFDIR)/lynx.cfg rm -f $(SYSCONFDIR)/lynx.cfg ;\
@@ -469,7 +467,7 @@ uninstall-doc :: @@ -481,7 +479,7 @@ uninstall-doc ::
update-po: update-po:
rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) ;\
- test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@ - ( test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@ )
+ test -f $(PO_SRCDIR)/makefile && $(MAKE) -C $(PO_SRCDIR) $@ + ( test -f $(PO_SRCDIR)/makefile && $(MAKE) -C $(PO_SRCDIR) $@ )
preinstall : preinstall :
@ echo '' @ echo '' ;\
diff --git a/src/makefile.in b/src/makefile.in diff --git a/src/makefile.in b/src/makefile.in
index 55611da..7cceaa8 100644 index 55611da..7cceaa8 100644
--- a/src/makefile.in --- a/src/makefile.in
+++ b/src/makefile.in +++ b/src/makefile.in
@@ -37,8 +37,6 @@ BUILD_EXEEXT = @BUILD_EXEEXT@ @@ -36,8 +36,6 @@ BUILD_EXEEXT = @BUILD_EXEEXT@
BUILD_LDFLAGS = @BUILD_LDFLAGS@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
BUILD_LIBS = @BUILD_LIBS@ BUILD_LIBS = @BUILD_LIBS@
@ -138,39 +138,39 @@ index 55611da..7cceaa8 100644
YACC = @YACC@ YACC = @YACC@
WINDRES = @WINDRES@ WINDRES = @WINDRES@
@@ -118,7 +116,7 @@ message: @@ -117,7 +115,7 @@ message:
@echo "Compiling Lynx sources" @echo "Compiling Lynx sources"
do_chartrans_stuff: do_chartrans_stuff:
- -cd chrtrans && $(MAKE_RECUR) \ - -( cd chrtrans && $(MAKE_RECUR) \
+ -$(MAKE) -C chrtrans \ + -( $(MAKE) -C chrtrans \
SITE_DEFS="$(SITE_DEFS)" \ SITE_DEFS="$(SITE_DEFS)" \
BUILD_CFLAGS="$(BUILD_CFLAGS)" \ BUILD_CFLAGS="$(BUILD_CFLAGS)" \
BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \ BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
@@ -131,7 +129,7 @@ lint: @@ -130,7 +128,7 @@ lint:
clean: clean:
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_* rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_*
- cd chrtrans && $(MAKE_RECUR) clean - ( cd chrtrans && $(MAKE_RECUR) clean )
+ $(MAKE) -C chrtrans clean + ( $(MAKE) -C chrtrans clean )
tags: tags:
$(CTAGS) *.[ch] $(CTAGS) *.[ch]
@@ -210,7 +208,7 @@ TABLES= \ @@ -209,7 +207,7 @@ TABLES= \
$(CHRTR)viscii_uni.h $(CHRTR)viscii_uni.h
$(TABLES): $(TABLES):
- -cd chrtrans && $(MAKE_RECUR) tables - -( cd chrtrans && $(MAKE_RECUR) tables )
+ -$(MAKE) -C chrtrans tables + -( $(MAKE) -C chrtrans tables )
UCdomap$o : UCdomap.c \ UCdomap$o : UCdomap.c \
chrtrans/UCkd.h \ chrtrans/UCkd.h \
@@ -219,7 +217,7 @@ UCdomap$o : UCdomap.c \ @@ -218,7 +216,7 @@ UCdomap$o : UCdomap.c \
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
chrtrans/makeuctb$(BUILD_EXEEXT): chrtrans/makeuctb$(BUILD_EXEEXT):
- cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT) - ( cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT) )
+ $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT) + ( $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT) )
UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
LYCookie$o : $(top_srcdir)/userdefs.h LYCookie$o : $(top_srcdir)/userdefs.h

8
lynx-2.8.9-redhat.patch
View File

@ -13,7 +13,7 @@ index f01782f..ccc0846 100644
--- a/lynx.cfg --- a/lynx.cfg
+++ b/lynx.cfg +++ b/lynx.cfg
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
# $LynxId: lynx.cfg,v 1.302 2018/07/08 15:22:44 tom Exp $ # $LynxId: lynx.cfg,v 1.324 2021/08/11 10:25:15 tom Exp $
# lynx.cfg file. # lynx.cfg file.
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix) -# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
-# or Lynx_Dir:lynx.cfg (VMS) -# 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. +# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg.
# #
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
#PRCS LYNX_VERSION "2.8.9rel.1" #PRCS LYNX_VERSION "2.9.0dev.10"
@@ -108,7 +110,7 @@ @@ -108,7 +110,7 @@
# #
# Normally we expect you will connect to a remote site, e.g., the Lynx starting # Normally we expect you will connect to a remote site, e.g., the Lynx starting
@ -60,7 +60,7 @@ index f01782f..ccc0846 100644
.h2 HTML5_CHARSETS .h2 HTML5_CHARSETS
# HTML5_CHARSETS is an alternative to ASSUME_CHARSET and ASSUME_LOCAL_CHARSET. # HTML5_CHARSETS is an alternative to ASSUME_CHARSET and ASSUME_LOCAL_CHARSET.
@@ -1847,6 +1849,9 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ @@ -1858,6 +1860,9 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
.ex .ex
#DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE #DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE
@ -70,7 +70,7 @@ index f01782f..ccc0846 100644
.h1 Interaction .h1 Interaction
.h2 NO_DOT_FILES .h2 NO_DOT_FILES
@@ -3451,6 +3456,7 @@ COLOR:6:brightred:black @@ -3467,6 +3472,7 @@ COLOR:6:brightred:black
#ENABLE_LYNXRC:VI_KEYS:ON #ENABLE_LYNXRC:VI_KEYS:ON
#ENABLE_LYNXRC:VISITED_LINKS:ON #ENABLE_LYNXRC:VISITED_LINKS:ON
.fi .fi

4
lynx-CVE-2008-4690.patch
View File

@ -16,7 +16,7 @@ diff --git a/CHANGES b/CHANGES
index 360be68..8eca013 100644 index 360be68..8eca013 100644
--- a/CHANGES --- a/CHANGES
+++ b/CHANGES +++ b/CHANGES
@@ -1355,6 +1355,13 @@ Changes since Lynx 2.8 release @@ -1534,6 +1534,13 @@ Changes since Lynx 2.8 release
* update win32 makefiles/build scripts to add LYmktime, parsdate modules -TD * update win32 makefiles/build scripts to add LYmktime, parsdate modules -TD
* update config.guess (2008-04-14), config.sub (2008-06-16) * 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 index ee2aad3..144050d 100644
--- a/lynx.cfg --- a/lynx.cfg
+++ b/lynx.cfg +++ b/lynx.cfg
@@ -1087,7 +1087,7 @@ LOCALE_CHARSET:TRUE @@ -1085,7 +1085,7 @@ LOCALE_CHARSET:TRUE
# #
# The default TRUSTED_LYNXCGI rule is "none". # The default TRUSTED_LYNXCGI rule is "none".
# #