Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
||||
SOURCES/lynx2.8.9rel.1.tar.bz2
|
||||
/lynx2.*.tar.bz2
|
||||
/lynx2.*.tar.bz2.asc
|
||||
|
@ -1 +0,0 @@
|
||||
3e00ac30d008e0aa879bfd037abcfd9c0dd2faec SOURCES/lynx2.8.9rel.1.tar.bz2
|
@ -1,25 +0,0 @@
|
||||
From d8a64ed1d63710ad764fbf3b1fb28d08204f9e72 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Wed, 13 Feb 2013 15:28:36 +0100
|
||||
Subject: [PATCH] avoid build failure caused by mistakenly excluded <locale.h>
|
||||
|
||||
---
|
||||
src/LYMain.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/LYMain.c b/src/LYMain.c
|
||||
index 9528be2..aaddb7b 100644
|
||||
--- a/src/LYMain.c
|
||||
+++ b/src/LYMain.c
|
||||
@@ -58,7 +58,7 @@
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
-#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL))
|
||||
+#if defined(LOCALE)
|
||||
#undef gettext /* Solaris locale.h prototypes gettext() */
|
||||
#include <locale.h>
|
||||
#ifndef HAVE_GETTEXT
|
||||
--
|
||||
1.7.1
|
||||
|
@ -1,51 +0,0 @@
|
||||
From e786483fb4b6fd2460c9a58ad7074e82ecf91747 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Hoger <thoger@redhat.com>
|
||||
Date: Thu, 19 Aug 2021 16:50:02 +0200
|
||||
Subject: [PATCH] Upstream patch for CVE-2021-38165
|
||||
|
||||
Extracted from lynx 2.9.0dev.9.
|
||||
|
||||
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1994998#c2
|
||||
---
|
||||
WWW/Library/Implementation/HTTP.c | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
|
||||
index 41ab849..4a50b41 100644
|
||||
--- a/WWW/Library/Implementation/HTTP.c
|
||||
+++ b/WWW/Library/Implementation/HTTP.c
|
||||
@@ -762,6 +762,23 @@ static char *StripIpv6Brackets(char *host)
|
||||
}
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * Remove user/password, if any, from the given host-string.
|
||||
+ */
|
||||
+#ifdef USE_SSL
|
||||
+static char *StripUserAuthents(char *host)
|
||||
+{
|
||||
+ char *p = strchr(host, '@');
|
||||
+
|
||||
+ if (p != NULL) {
|
||||
+ char *q = host;
|
||||
+
|
||||
+ while ((*q++ = *++p) != '\0') ;
|
||||
+ }
|
||||
+ return host;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/* Load Document from HTTP Server HTLoadHTTP()
|
||||
* ==============================
|
||||
*
|
||||
@@ -957,6 +974,7 @@ static int HTLoadHTTP(const char *arg,
|
||||
/* get host we're connecting to */
|
||||
ssl_host = HTParse(url, "", PARSE_HOST);
|
||||
ssl_host = StripIpv6Brackets(ssl_host);
|
||||
+ ssl_host = StripUserAuthents(ssl_host);
|
||||
#if defined(USE_GNUTLS_FUNCS)
|
||||
ret = gnutls_server_name_set(handle->gnutls_state,
|
||||
GNUTLS_NAME_DNS,
|
||||
--
|
||||
2.31.1
|
||||
|
@ -1,179 +0,0 @@
|
||||
From e6f2bec676f7abb4962821475fbc7cf918503e00 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Wed, 13 Feb 2013 15:25:00 +0100
|
||||
Subject: [PATCH] prepare upstream sources for parallel make
|
||||
|
||||
---
|
||||
makefile.in | 48 +++++++++++++++++++++++-------------------------
|
||||
src/makefile.in | 10 ++++------
|
||||
2 files changed, 27 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/makefile.in b/makefile.in
|
||||
index ad78441..0fd8b1e 100644
|
||||
--- a/makefile.in
|
||||
+++ b/makefile.in
|
||||
@@ -108,8 +108,6 @@ COMPRESS_EXT=@COMPRESS_EXT@
|
||||
# Path of scripts directory
|
||||
scripts_dir=$(srcdir)/scripts
|
||||
|
||||
-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)"
|
||||
-
|
||||
@LYNXCFG_MAKE@CFG2HTML = alphatoc.html body.html cattoc.html
|
||||
|
||||
# !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
@@ -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
|
||||
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR)
|
||||
- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
|
||||
- cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS)
|
||||
- cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
|
||||
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR)
|
||||
+ $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS)
|
||||
+ $(MAKE) -C $(CHR_DIR) all $(CHR_CFLAGS)
|
||||
+ $(MAKE) -C $(SRC_DIR) all $(SRC_CFLAGS)
|
||||
|
||||
lint:
|
||||
- cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
|
||||
- cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@
|
||||
- cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@
|
||||
+ $(MAKE) -C $(WWW_DIR) LINT="$(LINT)" $(WWW_CFLAGS) $@
|
||||
+ $(MAKE) -C $(SRC_DIR) LINT="$(LINT)" $(SRC_CFLAGS) $@
|
||||
+ $(MAKE) -C $(CHR_DIR) LINT="$(LINT)" $@
|
||||
|
||||
tags:
|
||||
- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@
|
||||
- cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@
|
||||
- cd $(CHR_DIR) && $(MAKE_RECUR) $@
|
||||
+ $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) $@
|
||||
+ $(MAKE) -C $(SRC_DIR) $(SRC_CFLAGS) $@
|
||||
+ $(MAKE) -C $(CHR_DIR) $@
|
||||
|
||||
etags:
|
||||
$(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch]
|
||||
@@ -231,27 +229,27 @@ help:
|
||||
clean:
|
||||
rm -f WWW/Library/*/*.[aoib]
|
||||
rm -f WWW/Library/*/.created
|
||||
- cd $(WWW_DIR) && $(MAKE_RECUR) $@
|
||||
- cd $(SRC_DIR) && $(MAKE_RECUR) $@
|
||||
+ $(MAKE) -C $(WWW_DIR) $@
|
||||
+ $(MAKE) -C $(SRC_DIR) $@
|
||||
@MSG_DIR_MAKE@ rm -f LYMessages.c
|
||||
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@
|
||||
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@
|
||||
rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
|
||||
@LYNXCFG_MAKE@ -rm -f $(CFG2HTML)
|
||||
rm -f help_files.sed
|
||||
rm -f core *.core
|
||||
|
||||
depend: cfg_defs.h LYHelp.h
|
||||
- cd $(WWW_DIR) && $(MAKE_RECUR) $@
|
||||
- cd $(SRC_DIR) && $(MAKE_RECUR) $@
|
||||
+ $(MAKE) -C $(WWW_DIR) $@
|
||||
+ $(MAKE) -C $(SRC_DIR) $@
|
||||
|
||||
distclean: clean
|
||||
-rm -f WWW/Library/*/*~
|
||||
-rm -f WWW/Library/*/*.bak
|
||||
-rm -rf $(SRC_DIR)/obsolete
|
||||
- -cd $(WWW_DIR) && $(MAKE_RECUR) $@
|
||||
- -cd $(SRC_DIR) && $(MAKE_RECUR) $@
|
||||
- -cd $(CHR_DIR) && $(MAKE_RECUR) $@
|
||||
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@
|
||||
+ -$(MAKE) -C $(WWW_DIR) $@
|
||||
+ -$(MAKE) -C $(SRC_DIR) $@
|
||||
+ -$(MAKE) -C $(CHR_DIR) $@
|
||||
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@
|
||||
@MSG_DIR_MAKE@ -rmdir $(PO_DIR)
|
||||
-rm -f *~ *.bak *.sav tags TAGS
|
||||
-rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile
|
||||
@@ -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 "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'
|
||||
-@LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
|
||||
+@LYNXCFG_MAKE@ $(MAKE) -C $(SRC_DIR) LYReadCFG.i
|
||||
@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/' | \
|
||||
@@ -436,7 +434,7 @@ install-lss : $(SYSCONFDIR)
|
||||
@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
|
||||
|
||||
uninstall ::
|
||||
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall
|
||||
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) uninstall
|
||||
-rm -f $(BINDIR)/$(binary_PROG)
|
||||
-rm -f $(MANDIR)/$(actual_PROG).1
|
||||
-rm -f $(SYSCONFDIR)/lynx.cfg
|
||||
@@ -469,7 +467,7 @@ uninstall-doc ::
|
||||
|
||||
update-po:
|
||||
rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR)
|
||||
- test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@
|
||||
+ test -f $(PO_SRCDIR)/makefile && $(MAKE) -C $(PO_SRCDIR) $@
|
||||
|
||||
preinstall :
|
||||
@ echo ''
|
||||
diff --git a/src/makefile.in b/src/makefile.in
|
||||
index 55611da..7cceaa8 100644
|
||||
--- a/src/makefile.in
|
||||
+++ b/src/makefile.in
|
||||
@@ -37,8 +37,6 @@ BUILD_EXEEXT = @BUILD_EXEEXT@
|
||||
BUILD_LDFLAGS = @BUILD_LDFLAGS@
|
||||
BUILD_LIBS = @BUILD_LIBS@
|
||||
|
||||
-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)"
|
||||
-
|
||||
YACC = @YACC@
|
||||
WINDRES = @WINDRES@
|
||||
|
||||
@@ -118,7 +116,7 @@ message:
|
||||
@echo "Compiling Lynx sources"
|
||||
|
||||
do_chartrans_stuff:
|
||||
- -cd chrtrans && $(MAKE_RECUR) \
|
||||
+ -$(MAKE) -C chrtrans \
|
||||
SITE_DEFS="$(SITE_DEFS)" \
|
||||
BUILD_CFLAGS="$(BUILD_CFLAGS)" \
|
||||
BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
|
||||
@@ -131,7 +129,7 @@ lint:
|
||||
|
||||
clean:
|
||||
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_*
|
||||
- cd chrtrans && $(MAKE_RECUR) clean
|
||||
+ $(MAKE) -C chrtrans clean
|
||||
|
||||
tags:
|
||||
$(CTAGS) *.[ch]
|
||||
@@ -210,7 +208,7 @@ TABLES= \
|
||||
$(CHRTR)viscii_uni.h
|
||||
|
||||
$(TABLES):
|
||||
- -cd chrtrans && $(MAKE_RECUR) tables
|
||||
+ -$(MAKE) -C chrtrans tables
|
||||
|
||||
UCdomap$o : UCdomap.c \
|
||||
chrtrans/UCkd.h \
|
||||
@@ -219,7 +217,7 @@ UCdomap$o : UCdomap.c \
|
||||
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
|
||||
|
||||
chrtrans/makeuctb$(BUILD_EXEEXT):
|
||||
- cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT)
|
||||
+ $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
|
||||
|
||||
UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
|
||||
LYCookie$o : $(top_srcdir)/userdefs.h
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -1,105 +0,0 @@
|
||||
From 0bd3f2aa9bd75263901e1f57a6cd9c4015084408 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Tue, 6 Nov 2018 12:32:04 +0100
|
||||
Subject: [PATCH] lynx: fix bugs detected by static analysis
|
||||
|
||||
---
|
||||
WWW/Library/Implementation/HTGopher.c | 1 +
|
||||
samples/lynxdump | 1 +
|
||||
src/LYBookmark.c | 2 ++
|
||||
src/LYDownload.c | 1 +
|
||||
src/LYLeaks.c | 24 ++++--------------------
|
||||
5 files changed, 9 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
|
||||
index a9ad41e..36ff592 100644
|
||||
--- a/WWW/Library/Implementation/HTGopher.c
|
||||
+++ b/WWW/Library/Implementation/HTGopher.c
|
||||
@@ -1651,6 +1651,7 @@ static int HTLoadCSO(const char *arg,
|
||||
(*Target->isa->put_block) (Target, buf, (int) strlen(buf));
|
||||
(*Target->isa->_free) (Target);
|
||||
free_CSOfields();
|
||||
+ BStrFree(command);
|
||||
return HT_LOADED;
|
||||
}
|
||||
/*
|
||||
diff --git a/samples/lynxdump b/samples/lynxdump
|
||||
index f79be2f..a0e9ae2 100755
|
||||
--- a/samples/lynxdump
|
||||
+++ b/samples/lynxdump
|
||||
@@ -12,4 +12,5 @@ if test $HOME/.lynxrc ; then
|
||||
fi
|
||||
echo 'keypad_mode=NUMBERS_AS_ARROWS' >> $MYTMP/.lynxrc
|
||||
HOME=$MYTMP; export HOME
|
||||
+umask $oldmask
|
||||
lynx -justify -dump -force_html -with_backspaces -nolist $*
|
||||
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
|
||||
index c3116ef..6464d96 100644
|
||||
--- a/src/LYBookmark.c
|
||||
+++ b/src/LYBookmark.c
|
||||
@@ -303,6 +303,7 @@ void save_bookmark_link(const char *address,
|
||||
LYMBM_statusline(CANCELLED);
|
||||
LYSleepMsg();
|
||||
FREE(bookmark_URL);
|
||||
+ BStrFree(tmp_data);
|
||||
return;
|
||||
}
|
||||
} while (!havevisible(string_data->str));
|
||||
@@ -347,6 +348,7 @@ void save_bookmark_link(const char *address,
|
||||
LYSleepAlert();
|
||||
FREE(Title);
|
||||
FREE(bookmark_URL);
|
||||
+ BStrFree(tmp_data);
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/src/LYDownload.c b/src/LYDownload.c
|
||||
index cf1ea98..9cf712d 100644
|
||||
--- a/src/LYDownload.c
|
||||
+++ b/src/LYDownload.c
|
||||
@@ -456,6 +456,7 @@ void LYDownload(char *line)
|
||||
cleanup:
|
||||
FREE(Line);
|
||||
BStrFree(buffer);
|
||||
+ BStrFree(command);
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/src/LYLeaks.c b/src/LYLeaks.c
|
||||
index 2f2de28..8c236ff 100644
|
||||
--- a/src/LYLeaks.c
|
||||
+++ b/src/LYLeaks.c
|
||||
@@ -1090,26 +1090,10 @@ static char *LYLeakSAVsprintf(char **dest,
|
||||
mark_realloced(ALp_old, *dest, strlen(*dest) + 1, cp_File, ssi_Line);
|
||||
return (*dest);
|
||||
}
|
||||
- if (vp_realloced == vp_oldAlloced) {
|
||||
- ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
- ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
- ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
- ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
- return (*dest);
|
||||
- }
|
||||
- /* Look up again, list may have changed! - kw */
|
||||
- ALp_old = FindInList(vp_oldAlloced);
|
||||
- if (ALp_old == NULL) {
|
||||
- ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
- ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
- ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
- ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
- } else {
|
||||
- ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
- ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
- ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
- ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
- }
|
||||
+ ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
+ ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
+ ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
+ ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
}
|
||||
return (*dest);
|
||||
}
|
||||
--
|
||||
2.17.2
|
||||
|
42
dickey@invisible-island.net-rsa3072.asc
Normal file
42
dickey@invisible-island.net-rsa3072.asc
Normal file
@ -0,0 +1,42 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
P46cd3aSov0rfNS/zg==
|
||||
=cr15
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
179
lynx-2.8.9-build.patch
Normal file
179
lynx-2.8.9-build.patch
Normal file
@ -0,0 +1,179 @@
|
||||
From e6f2bec676f7abb4962821475fbc7cf918503e00 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Wed, 13 Feb 2013 15:25:00 +0100
|
||||
Subject: [PATCH] prepare upstream sources for parallel make
|
||||
|
||||
---
|
||||
makefile.in | 48 +++++++++++++++++++++++-------------------------
|
||||
src/makefile.in | 10 ++++------
|
||||
2 files changed, 27 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/makefile.in b/makefile.in
|
||||
index ad78441..0fd8b1e 100644
|
||||
--- a/makefile.in
|
||||
+++ b/makefile.in
|
||||
@@ -108,8 +108,6 @@ COMPRESS_EXT=@COMPRESS_EXT@
|
||||
# Path of scripts directory
|
||||
scripts_dir=$(srcdir)/scripts
|
||||
|
||||
-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)"
|
||||
-
|
||||
@LYNXCFG_MAKE@CFG2HTML = alphatoc.html body.html cattoc.html
|
||||
|
||||
# !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
@@ -199,20 +197,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
|
||||
-@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) )
|
||||
- ( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) )
|
||||
- ( cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS) )
|
||||
- ( cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS) )
|
||||
+@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) )
|
||||
+ ( $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) )
|
||||
+ ( $(MAKE) -C $(CHR_DIR) all $(CHR_CFLAGS) )
|
||||
+ ( $(MAKE) -C $(SRC_DIR) all $(SRC_CFLAGS) )
|
||||
|
||||
lint:
|
||||
- ( cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ )
|
||||
- ( cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@ )
|
||||
- ( cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@ )
|
||||
+ ( $(MAKE) -C $(WWW_DIR) LINT="$(LINT)" $(WWW_CFLAGS) $@ )
|
||||
+ ( $(MAKE) -C $(SRC_DIR) LINT="$(LINT)" $(SRC_CFLAGS) $@ )
|
||||
+ ( $(MAKE) -C $(CHR_DIR) LINT="$(LINT)" $@ )
|
||||
|
||||
tags:
|
||||
- ( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@ )
|
||||
- ( cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@ )
|
||||
- ( cd $(CHR_DIR) && $(MAKE_RECUR) $@ )
|
||||
+ ( $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) $@ )
|
||||
+ ( $(MAKE) -C $(SRC_DIR) $(SRC_CFLAGS) $@ )
|
||||
+ ( $(MAKE) -C $(CHR_DIR) $@ )
|
||||
|
||||
etags:
|
||||
$(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch]
|
||||
@@ -233,27 +231,27 @@ help:
|
||||
clean:
|
||||
rm -f WWW/Library/*/*.[aoib]
|
||||
rm -f WWW/Library/*/.created
|
||||
- ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
|
||||
- ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
|
||||
+ ( $(MAKE) -C $(WWW_DIR) $@ )
|
||||
+ ( $(MAKE) -C $(SRC_DIR) $@ )
|
||||
@MSG_DIR_MAKE@ rm -f LYMessages.c
|
||||
-@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) $@ )
|
||||
+@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) $@ )
|
||||
rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
|
||||
@LYNXCFG_MAKE@ -rm -f $(CFG2HTML)
|
||||
rm -f help_files.sed
|
||||
rm -f core *.core
|
||||
|
||||
depend: cfg_defs.h LYHelp.h
|
||||
- ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
|
||||
- ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
|
||||
+ ( $(MAKE) -C $(WWW_DIR) $@ )
|
||||
+ ( $(MAKE) -C $(SRC_DIR) $@ )
|
||||
|
||||
distclean: clean
|
||||
-rm -f WWW/Library/*/*~
|
||||
-rm -f WWW/Library/*/*.bak
|
||||
-rm -rf $(SRC_DIR)/obsolete
|
||||
- -( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
|
||||
- -( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
|
||||
- -( cd $(CHR_DIR) && $(MAKE_RECUR) $@ )
|
||||
-@MSG_DIR_MAKE@ -( cd $(PO_DIR) && $(MAKE_RECUR) $@ )
|
||||
+ -( $(MAKE) -C $(WWW_DIR) $@ )
|
||||
+ -( $(MAKE) -C $(SRC_DIR) $@ )
|
||||
+ -( $(MAKE) -C $(CHR_DIR) $@ )
|
||||
+@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) $@ )
|
||||
@MSG_DIR_MAKE@ -rmdir $(PO_DIR)
|
||||
-rm -f *~ *.bak *.sav tags TAGS
|
||||
-rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile
|
||||
@@ -299,7 +297,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 "P=$(binary_PROG); \
|
||||
if test -f $(BINDIR)/$$P ; then \
|
||||
mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"; \
|
||||
@@ -350,7 +348,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/'
|
||||
@LYNXCFG_MAKE@@MAKE_PHONY@$(CFG2HTML): htmlized_cfg
|
||||
@LYNXCFG_MAKE@@MAKE_PHONY@htmlized_cfg:
|
||||
@LYNXCFG_MAKE@ @echo "Making htmlized lynx.cfg"
|
||||
-@LYNXCFG_MAKE@ ( cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i )
|
||||
+@LYNXCFG_MAKE@ ( $(MAKE) -C $(SRC_DIR) LYReadCFG.i )
|
||||
@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/' | \
|
||||
@@ -448,7 +446,7 @@ install-lss : $(SYSCONFDIR)
|
||||
@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
|
||||
|
||||
uninstall ::
|
||||
-@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) uninstall )
|
||||
+@MSG_DIR_MAKE@ ( $(MAKE) -C $(PO_DIR) uninstall )
|
||||
-rm -f $(BINDIR)/$(binary_PROG) ;\
|
||||
rm -f $(MANDIR)/$(actual_PROG).1 ;\
|
||||
rm -f $(SYSCONFDIR)/lynx.cfg ;\
|
||||
@@ -481,7 +479,7 @@ uninstall-doc ::
|
||||
|
||||
update-po:
|
||||
rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) ;\
|
||||
- ( test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@ )
|
||||
+ ( test -f $(PO_SRCDIR)/makefile && $(MAKE) -C $(PO_SRCDIR) $@ )
|
||||
|
||||
preinstall :
|
||||
@ echo '' ;\
|
||||
diff --git a/src/makefile.in b/src/makefile.in
|
||||
index 55611da..7cceaa8 100644
|
||||
--- a/src/makefile.in
|
||||
+++ b/src/makefile.in
|
||||
@@ -36,8 +36,6 @@ BUILD_EXEEXT = @BUILD_EXEEXT@
|
||||
BUILD_LDFLAGS = @BUILD_LDFLAGS@
|
||||
BUILD_LIBS = @BUILD_LIBS@
|
||||
|
||||
-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)"
|
||||
-
|
||||
YACC = @YACC@
|
||||
WINDRES = @WINDRES@
|
||||
|
||||
@@ -117,7 +115,7 @@ message:
|
||||
@echo "Compiling Lynx sources"
|
||||
|
||||
do_chartrans_stuff:
|
||||
- -( cd chrtrans && $(MAKE_RECUR) \
|
||||
+ -( $(MAKE) -C chrtrans \
|
||||
SITE_DEFS="$(SITE_DEFS)" \
|
||||
BUILD_CFLAGS="$(BUILD_CFLAGS)" \
|
||||
BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
|
||||
@@ -130,7 +128,7 @@ lint:
|
||||
|
||||
clean:
|
||||
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_*
|
||||
- ( cd chrtrans && $(MAKE_RECUR) clean )
|
||||
+ ( $(MAKE) -C chrtrans clean )
|
||||
|
||||
tags:
|
||||
$(CTAGS) *.[ch]
|
||||
@@ -209,7 +207,7 @@ TABLES= \
|
||||
$(CHRTR)viscii_uni.h
|
||||
|
||||
$(TABLES):
|
||||
- -( cd chrtrans && $(MAKE_RECUR) tables )
|
||||
+ -( $(MAKE) -C chrtrans tables )
|
||||
|
||||
UCdomap$o : UCdomap.c \
|
||||
chrtrans/UCkd.h \
|
||||
@@ -218,7 +216,7 @@ UCdomap$o : UCdomap.c \
|
||||
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
|
||||
|
||||
chrtrans/makeuctb$(BUILD_EXEEXT):
|
||||
- ( cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT) )
|
||||
+ ( $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT) )
|
||||
|
||||
UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
|
||||
LYCookie$o : $(top_srcdir)/userdefs.h
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -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.0
|
||||
|
||||
---
|
||||
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.302 2018/07/08 15:22:44 tom Exp $
|
||||
# $LynxId: lynx.cfg,v 1.335 2024/01/15 11:31:00 tom Exp $
|
||||
# lynx.cfg file.
|
||||
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
|
||||
-# or Lynx_Dir:lynx.cfg (VMS)
|
||||
@ -22,8 +22,8 @@ index f01782f..ccc0846 100644
|
||||
+# Please don't edit this file directly (it is updated with every Red Hat
|
||||
+# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg.
|
||||
#
|
||||
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
|
||||
#PRCS LYNX_VERSION "2.8.9rel.1"
|
||||
# LYNX_VERSION "2.9.0"
|
||||
# LYNX_DATE "15 Jan 2024"
|
||||
@@ -108,7 +110,7 @@
|
||||
#
|
||||
# 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
|
||||
# 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
|
||||
#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
|
||||
|
||||
.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:VISITED_LINKS:ON
|
||||
.fi
|
@ -16,7 +16,7 @@ diff --git a/CHANGES b/CHANGES
|
||||
index 360be68..8eca013 100644
|
||||
--- a/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 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 @@ LOCALE_CHARSET:TRUE
|
||||
@@ -1085,7 +1085,7 @@ LOCALE_CHARSET:TRUE
|
||||
#
|
||||
# The default TRUSTED_LYNXCGI rule is "none".
|
||||
#
|
@ -1,13 +1,18 @@
|
||||
%global devrel 1
|
||||
#%%global devrel dev.12
|
||||
%global devrel %{nil}
|
||||
|
||||
Summary: A text-based Web browser
|
||||
Name: lynx
|
||||
Version: 2.8.9
|
||||
Release: 4%{?dist}
|
||||
License: GPLv2
|
||||
Group: Applications/Internet
|
||||
Source: https://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}rel.%{devrel}.tar.bz2
|
||||
URL: http://lynx.browser.org/
|
||||
Version: 2.9.0
|
||||
#Release: %%{devrel}.1%%{?dist}
|
||||
Release: 6%{?dist}
|
||||
License: GPL-2.0-only
|
||||
|
||||
Source0: https://invisible-island.net/archives/lynx/tarballs/lynx%{version}%{devrel}.tar.bz2
|
||||
Source1: https://invisible-island.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
|
||||
Patch0: lynx-2.8.9-redhat.patch
|
||||
@ -21,30 +26,25 @@ Patch1: lynx-2.8.9-build.patch
|
||||
# [CVE-2008-4690]
|
||||
Patch2: lynx-CVE-2008-4690.patch
|
||||
|
||||
# avoid build failure caused by mistakenly excluded <locale.h>
|
||||
Patch3: lynx-2.8.8-locale.patch
|
||||
|
||||
# fix bugs detected by static analysis (#1602612)
|
||||
Patch4: lynx-2.8.9-static-analysis.patch
|
||||
|
||||
# fix disclosure of HTTP auth credentials via SNI data (CVE-2021-38165)
|
||||
Patch5: lynx-2.8.9-CVE-2021-38165.patch
|
||||
|
||||
Provides: webclient
|
||||
Provides: text-www-browser
|
||||
BuildRequires: brotli-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: libidn2-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: slang-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: telnet
|
||||
BuildRequires: unzip
|
||||
BuildRequires: zip
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
# provides /usr/share/doc/HTML/en-US/index.html used as STARTFILE on RHEL
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} && !0%{?eln}
|
||||
Requires: redhat-indexhtml
|
||||
%endif
|
||||
|
||||
@ -55,22 +55,31 @@ advantage Lynx has over graphical browsers is speed; Lynx starts and
|
||||
exits quickly and swiftly displays web pages.
|
||||
|
||||
%prep
|
||||
%setup -q -n lynx2.8.9rel.%{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
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} && !0%{?eln}
|
||||
sed -e 's,^STARTFILE:.*,STARTFILE:file:/usr/share/doc/HTML/en-US/index.html,' -i lynx.cfg
|
||||
%endif
|
||||
|
||||
%build
|
||||
# These options are specified explicitly below but are also defaults in 2.9.0:
|
||||
# --enable-addrlist-page
|
||||
# --enable-cjk
|
||||
# --enable-file-upload
|
||||
# --enable-japanese-utf8
|
||||
# --enable-justify-elts
|
||||
# --enable-locale-charset
|
||||
# --enable-persistent-cookies
|
||||
# --enable-prettysrc
|
||||
# --enable-read-eta
|
||||
# --enable-scrollbar
|
||||
# --enable-source-cache
|
||||
# --with-brotli
|
||||
# --with-bzlib
|
||||
# --with-zlib
|
||||
%configure --libdir=/etc \
|
||||
--disable-font-switch \
|
||||
--disable-rpath-hack \
|
||||
@ -82,6 +91,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 \
|
||||
@ -99,20 +109,18 @@ sed -e 's,^STARTFILE:.*,STARTFILE:file:/usr/share/doc/HTML/en-US/index.html,' -i
|
||||
--enable-warnings \
|
||||
--with-screen=ncursesw \
|
||||
--with-ssl=%{_libdir} \
|
||||
--with-brotli \
|
||||
--with-bzlib \
|
||||
--with-zlib \
|
||||
ac_cv_path_RLOGIN=/usr/bin/rlogin
|
||||
|
||||
make -C po
|
||||
make %{?_smp_mflags}
|
||||
|
||||
# remove zero-length tests files to silence rpmlint
|
||||
rm -fv test/X test/nobody
|
||||
%make_build
|
||||
|
||||
%install
|
||||
chmod -x samples/mailto-form.pl
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
|
||||
# remove unneeded files with incompatible encoding
|
||||
# remove unneeded files
|
||||
rm -f docs/{OS-390.announce,README.jp}
|
||||
rm -f samples/*.bat
|
||||
|
||||
@ -120,9 +128,6 @@ rm -f samples/*.bat
|
||||
dos2unix samples/lynx-demo.cfg
|
||||
dos2unix samples/midnight.lss
|
||||
|
||||
# Install Lang dependent resources
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/
|
||||
|
||||
cat >$RPM_BUILD_ROOT%{_sysconfdir}/lynx-site.cfg <<EOF
|
||||
# Place any local lynx configuration options (proxies etc.) here.
|
||||
EOF
|
||||
@ -130,20 +135,115 @@ EOF
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc docs README INSTALLATION samples
|
||||
%license COPYING
|
||||
%doc docs README 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
|
||||
* Tue Aug 31 2021 Kamil Dudka <kdudka@redhat.com> - 2.8.9-4
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.9.0-6
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.9.0-5
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Tue Jan 23 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.0-4
|
||||
- enable bzip2 support
|
||||
|
||||
* Mon Jan 22 2024 Thomas E. Dickey <dickey@invisible-island.net> - 2.9.0-3
|
||||
- add brotli build-dependency
|
||||
- restore formerly-empty sample files
|
||||
- remove a couple of obsolete workarounds for installing
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Jan 16 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.0-1
|
||||
- rebase to latest upstream version
|
||||
|
||||
* Fri Oct 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.0-dev.12.2
|
||||
- fix FTBFS in Fedora Rawhide (rhbz#2243829)
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-dev.12.1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* 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)
|
||||
|
||||
* Tue Apr 11 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.0-dev.10.2.4
|
||||
- migrate to SPDX license format
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-dev.10.2.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Dec 2 2022 Florian Weimer <fweimer@redhat.com> - 2.9.0-dev.10.2.2
|
||||
- Port the configure script to C99
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-dev.10.2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jul 07 2022 Kamil Dudka <kdudka@redhat.com> - 2.9.0dev.10.2
|
||||
- add presentation type for xhtml
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-dev.10.1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Jan 10 2022 Kamil Dudka <kdudka@redhat.com> - 2.9.0dev.10.1
|
||||
- add BR for libidn2-devel (#1910971)
|
||||
|
||||
* Fri Jan 07 2022 Thomas E. Dickey - 2.9.0dev.10
|
||||
- Correct homepage URL.
|
||||
- Update to lynx 2.9.0dev.10, removing obsolete patches.
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.8.9-14
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Tue Aug 31 2021 Kamil Dudka <kdudka@redhat.com> - 2.8.9-13
|
||||
- fix disclosure of HTTP auth credentials via SNI data (CVE-2021-38165)
|
||||
|
||||
* Thu Nov 08 2018 Kamil Dudka <kdudka@redhat.com> - 2.8.9-2
|
||||
- fix bugs detected by static analysis (#1602612)
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Dec 30 2020 Kamil Dudka <kdudka@redhat.com> - 2.8.9-10
|
||||
- remove unused build-time dependency on slang-devel (#1910966)
|
||||
|
||||
* Thu Aug 06 2020 Merlin Mathesius <mmathesi@redhat.com> - 2.8.9-9
|
||||
- Skip RHEL-specific Requires and STARTFILE edit when building for ELN
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Mar 11 2019 Kamil Dudka <kdudka@redhat.com> - 2.8.9-5
|
||||
- include license file in the package (#1686886)
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Nov 08 2018 Kamil Dudka <kdudka@redhat.com> - 2.8.9-3
|
||||
- fix bugs detected by static analysis
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 10 2018 Kamil Dudka <kdudka@redhat.com> - 2.8.9-1
|
||||
- update to the latest upstream release
|
||||
@ -320,7 +420,7 @@ EOF
|
||||
- Rebuild for openssl bump
|
||||
|
||||
* Wed Dec 5 2007 Ivana Varekova <varekova@redhat.com> - 2.8.6-8
|
||||
- rebuild
|
||||
- rebuild
|
||||
|
||||
* Fri Oct 12 2007 Ivana Varekova <varekova@redhat.com> - 2.8.6-7
|
||||
- add provides:text-www-browser flag
|
||||
@ -564,7 +664,7 @@ EOF
|
||||
- apply some update patches from the lynx folks
|
||||
- set user's TEMP dir to their home dir to avoid /tmp races
|
||||
|
||||
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
||||
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
||||
- auto rebuild in the new build environment (release 10)
|
||||
|
||||
* Wed Feb 24 1999 Bill Nottingham <notting@redhat.com>
|
11
plans/tier1-internal.fmf
Normal file
11
plans/tier1-internal.fmf
Normal file
@ -0,0 +1,11 @@
|
||||
summary: Internal gating tests plan
|
||||
discover:
|
||||
- name: Internal gating tests
|
||||
how: fmf
|
||||
filter: 'tag: CI-Tier-1'
|
||||
url: https://pkgs.devel.redhat.com/git/tests/lynx
|
||||
execute:
|
||||
how: tmt
|
||||
adjust:
|
||||
enabled: false
|
||||
when: distro == centos-stream or distro == fedora
|
2
sources
Normal file
2
sources
Normal file
@ -0,0 +1,2 @@
|
||||
SHA512 (lynx2.9.0.tar.bz2.asc) = f08e46bf960a54656045d0874a3dd9811511589147bfe764efce43f87eb62d4a3e448b31edad60a485fc51f57d27dc0b87aae9df2e4dce5fbd9dea2f776a8f5d
|
||||
SHA512 (lynx2.9.0.tar.bz2) = 4c716a246d80db0558dcdb6599bff9854a7356c43da94e0c854453e68b84e8de8a082c6c48e6329e8f4b6f70711ea41dad5a8f5669c782a8c9ce6351083b2df0
|
Loading…
Reference in New Issue
Block a user