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

- new upstream release

Browse Source 
- dropped applied patches
- fixed regression from #533004
- cleanup in BuildRequires
This commit is contained in:
Kamil Dudka 2010-01-05 16:45:07 +00:00
parent a36b4f64a8
commit b975527c2f
11 changed files with 214 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
lynx2.8.6.tar.bz2
lynx2.8.7.tar.bz2

7
lynx-2.8.6-backgrcolor.patch
View File

@ -1,6 +1,7 @@
diff -up lynx2-8-6/samples/lynx.lss.pom lynx2-8-6/samples/lynx.lss
--- lynx2-8-6/samples/lynx.lss.pom 2006-09-19 02:28:28.000000000 +0200
+++ lynx2-8-6/samples/lynx.lss 2007-12-06 15:19:09.000000000 +0100
diff --git a/samples/lynx.lss b/samples/lynx.lss
index 2d02eb1..a46d163 100644
--- a/samples/lynx.lss
+++ b/samples/lynx.lss
@@ -5,8 +5,8 @@
#
# If you really want the terminal's default colors, and if lynx is built using

97
lynx-2.8.6-fmt_string.patch
View File

@ -1,97 +0,0 @@
--- lynx2-8-6/WWW/Library/Implementation/HTString.c_old 2007/05/16 21:44:23 1.49
+++ lynx2-8-6/WWW/Library/Implementation/HTString.c 2008/01/09 00:06:06
@@ -619,6 +619,46 @@
const char *fmt,
va_list * ap)
{
+#ifdef HAVE_VASPRINTF
+ /*
+ * Use vasprintf() if we have it, since it is simplest.
+ */
+ char *result = 0;
+ char *temp = 0;
+
+ /* discard old destination if no length was given */
+ if (pstr && !dst_len) {
+ if (*pstr)
+ FREE(*pstr);
+ }
+
+ if (vasprintf(&temp, fmt, *ap) >= 0) {
+ if (dst_len != 0) {
+ int src_len = strlen(temp);
+ int new_len = dst_len + src_len + 1;
+
+ result = HTAlloc(pstr ? *pstr : 0, new_len);
+ if (result != 0) {
+ strcpy(result + dst_len, temp);
+ mark_malloced(temp, new_len);
+ }
+ free(temp);
+ } else {
+ result = temp;
+ mark_malloced(temp, strlen(temp));
+ }
+ }
+
+ if (pstr != 0)
+ *pstr = result;
+
+ return result;
+#else /* !HAVE_VASPRINTF */
+ /*
+ * If vasprintf() is not available, this works - but does not implement
+ * the POSIX '$' formatting character which may be used in some of the
+ * ".po" files.
+ */
#ifdef SAVE_TIME_NOT_SPACE
static size_t tmp_len = 0;
static size_t fmt_len = 0;
@@ -634,20 +674,9 @@
char *dst_ptr = *pstr;
const char *format = fmt;
- if (fmt == 0 || *fmt == '\0')
+ if (isEmpty(fmt))
return 0;
-#ifdef USE_VASPRINTF
- if (pstr && !dst_len) {
- if (*pstr)
- FREE(*pstr);
- if (vasprintf(pstr, fmt, *ap) >= 0) {
- mark_malloced(*pstr, strlen(*pstr) + 1);
- return (*pstr);
- }
- }
-#endif /* USE_VASPRINTF */
-
need = strlen(fmt) + 1;
#ifdef SAVE_TIME_NOT_SPACE
if (!fmt_ptr || fmt_len < need * NUM_WIDTH) {
@@ -848,6 +877,7 @@
if (pstr)
*pstr = dst_ptr;
return (dst_ptr);
+#endif /* HAVE_VASPRINTF */
}
#undef SAVE_TIME_NOT_SPACE
@@ -895,16 +925,7 @@
LYva_start(ap, fmt);
{
-#ifdef USE_VASPRINTF
- if (pstr) {
- if (*pstr)
- FREE(*pstr);
- if (vasprintf(pstr, fmt, ap) >= 0) /* else call outofmem?? */
- mark_malloced(*pstr, strlen(*pstr) + 1);
- result = *pstr;
- } else
-#endif /* USE_VASPRINTF */
- result = StrAllocVsprintf(pstr, 0, fmt, &ap);
+ result = StrAllocVsprintf(pstr, 0, fmt, &ap);
}
va_end(ap);

30
lynx-2.8.6-options.patch
View File

@ -1,30 +0,0 @@
--- lynx2-8-6/src/LYMain.c.pom 2006-09-19 02:28:28.000000000 +0200
+++ lynx2-8-6/src/LYMain.c 2007-10-02 13:42:07.000000000 +0200
@@ -4083,6 +4083,7 @@ static BOOL parse_arg(char **argv,
#if EXTENDED_STARTFILE_RECALL
static BOOLEAN no_options_further = FALSE; /* set to TRUE after '--' argument */
+ static int nof_index = 0; /* set the index of -- argument */
#endif
arg_name = argv[0];
@@ -4102,9 +4103,9 @@ static BOOL parse_arg(char **argv,
/*
* Check for a command line startfile. - FM
*/
- if (*arg_name != '-'
+ if (*arg_name != '-'
#if EXTENDED_OPTION_LOGIC
- || no_options_further == TRUE
+ || (no_options_further == TRUE && nof_index<(*countp))
#endif
) {
#if EXTENDED_STARTFILE_RECALL
@@ -4140,6 +4141,7 @@ static BOOL parse_arg(char **argv,
#if EXTENDED_OPTION_LOGIC
if (strcmp(arg_name, "--") == 0) {
no_options_further = TRUE;
+ nof_index = *countp;
return TRUE;
}
#endif

61
lynx-2.8.6-redhat.patch
View File

@ -1,7 +1,9 @@
diff -up lynx2-8-6/lynx.cfg.redhat lynx2-8-6/lynx.cfg
--- lynx2-8-6/lynx.cfg.redhat 2006-09-18 20:28:28.000000000 -0400
+++ lynx2-8-6/lynx.cfg 2008-08-07 13:58:33.000000000 -0400
@@ -1,7 +1,10 @@
diff --git a/lynx.cfg b/lynx.cfg
index c4ce454..de9111f 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,8 +1,11 @@
# $LynxId: lynx.cfg,v 1.180 2009/06/07 17:02:21 tom Exp $
# lynx.cfg file.
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
+# The default placement for this file is /etc/lynx.cfg (Red Hat Linux, Fedora)
@ -11,18 +13,18 @@ diff -up lynx2-8-6/lynx.cfg.redhat lynx2-8-6/lynx.cfg
+# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg.
+#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
#PRCS LYNX_VERSION "2.8.6rel.5"
#PRCS LYNX_VERSION "2.8.7rel.1"
#
@@ -92,7 +95,7 @@
@@ -93,7 +96,7 @@
#
# Normally we expect you will connect to a remote site, e.g., the Lynx starting
# site:
-STARTFILE:http://lynx.isc.org/
+STARTFILE:file:/usr/share/doc/HTML/index.html
+STARTFILE:http://start.fedoraproject.org
#
# As an alternative, you may want to use a local URL. A good choice for this is
# the user's home directory:
@@ -396,7 +399,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
@@ -442,7 +445,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
# Lynx (case insensitive).
# Find RFC 1345 at http://www.ics.uci.edu/pub/ietf/uri/rfc1345.txt .
#
@ -31,7 +33,7 @@ diff -up lynx2-8-6/lynx.cfg.redhat lynx2-8-6/lynx.cfg
.h2 LOCALE_CHARSET
# LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to
@@ -1776,6 +1779,9 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
@@ -1857,6 +1860,9 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
.ex
#DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE
@ -41,7 +43,7 @@ diff -up lynx2-8-6/lynx.cfg.redhat lynx2-8-6/lynx.cfg
.h1 Interaction
@@ -3366,6 +3372,7 @@ COLOR:6:brightred:black
@@ -3472,6 +3478,7 @@ COLOR:6:brightred:black
#ENABLE_LYNXRC:vi_keys:ON
#ENABLE_LYNXRC:visited_links:ON
.fi
@ -49,10 +51,11 @@ diff -up lynx2-8-6/lynx.cfg.redhat lynx2-8-6/lynx.cfg
.h1 External Programs
# Any of the compiled-in pathnames of external programs can be overridden
diff -up lynx2-8-6/userdefs.h.redhat lynx2-8-6/userdefs.h
--- lynx2-8-6/userdefs.h.redhat 2004-12-30 07:11:59.000000000 -0500
+++ lynx2-8-6/userdefs.h 2008-08-07 13:56:42.000000000 -0400
@@ -100,7 +100,7 @@
diff --git a/userdefs.h b/userdefs.h
index 3fc4ff6..3d2f7e5 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -105,7 +105,7 @@
* mailcap files (see the examples in the samples directory).
*/
#ifndef LYNX_CFG_FILE
@ -61,7 +64,7 @@ diff -up lynx2-8-6/userdefs.h.redhat lynx2-8-6/userdefs.h
#endif /* LYNX_CFG_FILE */
/**************************
@@ -110,8 +110,8 @@
@@ -115,8 +115,8 @@
* Mappings in these global and personal files override any SUFFIX
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
*/
@ -72,7 +75,7 @@ diff -up lynx2-8-6/userdefs.h.redhat lynx2-8-6/userdefs.h
/**************************
* The MAILCAP file allows you to map file MIME types to
@@ -120,7 +120,7 @@
@@ -125,7 +125,7 @@
* Mappings in these global and personal files override any VIEWER
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
*/
@ -81,7 +84,7 @@ diff -up lynx2-8-6/userdefs.h.redhat lynx2-8-6/userdefs.h
#define PERSONAL_MAILCAP ".mailcap"
/**************************
@@ -284,7 +284,7 @@
@@ -289,7 +289,7 @@
#ifdef DOSPATH
#define LYNX_CFG_FILE "./lynx.cfg"
#else
@ -90,25 +93,7 @@ diff -up lynx2-8-6/userdefs.h.redhat lynx2-8-6/userdefs.h
#endif /* DOSPATH */
#endif /* LYNX_CFG_FILE */
#endif /* HAVE_CONFIG_H */
@@ -296,7 +296,7 @@
* Mappings in these global and personal files override any SUFFIX
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
*/
-#define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types"
+#define GLOBAL_EXTENSION_MAP "/etc/mime.types"
#define PERSONAL_EXTENSION_MAP ".mime.types"
/**************************
@@ -306,7 +306,7 @@
* Mappings in these global and personal files override any VIEWER
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
*/
-#define GLOBAL_MAILCAP "/usr/local/lib/mosaic/mailcap"
+#define GLOBAL_MAILCAP "/etc/mailcap"
#define PERSONAL_MAILCAP ".mailcap"
/**************************
@@ -324,7 +324,7 @@
@@ -333,7 +333,7 @@
* use any default viewers for image types. Note that open is used as
* the default for NeXT, instead of the XLOADIMAGE_COMMAND definition.
*/
@ -117,7 +102,7 @@ diff -up lynx2-8-6/userdefs.h.redhat lynx2-8-6/userdefs.h
/**************************
* For UNIX systems, SYSTEM_MAIL and SYSTEM_MAIL_FLAGS are set by the
@@ -345,7 +345,7 @@
@@ -354,7 +354,7 @@
* the "TMPDIR" (unix), or "TEMP" or "TMP" (Windows,DOS,OS/2)
* variable.
*/
@ -126,7 +111,7 @@ diff -up lynx2-8-6/userdefs.h.redhat lynx2-8-6/userdefs.h
/********************************
* Comment this line out to disable code that implements command logging
@@ -1134,7 +1134,7 @@
@@ -1156,7 +1156,7 @@
* OSU server distribution.
*/
#ifndef HAVE_CONFIG_H

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

@ -1,36 +1,52 @@
--- lynx2-8-6/CHANGES.old 2008-11-06 15:29:26.000000000 +0100
+++ lynx2-8-6/CHANGES 2008-11-06 15:32:44.000000000 +0100
@@ -1,5 +1,11 @@
diff --git a/CHANGES b/CHANGES
index 23cc304..4a59ceb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,6 @@
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
+2008-10-26
+* modify patch for CVE-2005-2929 to prompt user before executing command via
+ a lynxcgi link even in advanced mode, as the actual URL may not be shown but
+ hidden behind an HTTP redirect
+* set TRUSTED_LYNXCGI:none in lynx.cfg to disable all lynxcgi URLs by default
+ [CVE-2008-4690]
-
2009-07-05 (2.8.7rel.1)
* update metrics for 2.8.7 release.
* fix ifdef'ing for cfg_bad_html (report by Gabor Z Papp) -TD
@@ -244,6 +243,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)
2007-05-09 (2.8.6rel.5 fix from 2.8.7dev.5)
* correct loop-limit in print_crawl_to_fd(), which broke
--- lynx2-8-6/src/LYCgi.c.old 2008-11-06 15:29:58.000000000 +0100
+++ lynx2-8-6/src/LYCgi.c 2008-11-06 15:30:53.000000000 +0100
@@ -165,7 +165,7 @@ static BOOL can_exec_cgi(const char *lin
if (!exec_ok(HTLoadedDocumentURL(), linktext, CGI_PATH)) {
/* exec_ok gives out msg. */
result = FALSE;
- } else if (user_mode < ADVANCED_MODE) {
+ } else {
StrAllocCopy(command, linktext);
if (non_empty(linkargs)) {
HTSprintf(&command, " %s", linkargs);
--- lynx2-8-5.orig/lynx.cfg 2008-10-26 21:45:02.000000000 +0100
+++ lynx2-8-5/lynx.cfg 2008-10-26 21:45:38.000000000 +0100
@@ -997,7 +997,7 @@ CHARACTER_SET:utf-8
# ====
# Do not define this.
+2008-10-26
+* modify patch for CVE-2005-2929 to prompt user before executing command via
+ a lynxcgi link even in advanced mode, as the actual URL may not be shown but
+ hidden behind an HTTP redirect
+* set TRUSTED_LYNXCGI:none in lynx.cfg to disable all lynxcgi URLs by default
+ [CVE-2008-4690]
+
2008-09-21 (2.8.7dev.10)
* remove rw.po, since the translation project no longer supplies it -TD
* implement "readonly" attribute for TEXTAREA and TEXT fields -TD
diff --git a/lynx.cfg b/lynx.cfg
index acdfae1..e83a4bf 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1081,7 +1081,7 @@ CHARACTER_SET:utf-8
#
# The default TRUSTED_LYNXCGI rule is "none".
#
-#TRUSTED_LYNXCGI:none
+TRUSTED_LYNXCGI:none
.h2 LYNXCGI_ENVIRONMENT
diff --git a/src/LYCgi.c b/src/LYCgi.c
index cfaf18f..aceed8d 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -167,7 +167,7 @@ static BOOL can_exec_cgi(const char *linktext, const char *linkargs)
if (!exec_ok(HTLoadedDocumentURL(), linktext, CGI_PATH)) {
/* exec_ok gives out msg. */
result = FALSE;
- } else {
+ } else if (user_mode < ADVANCED_MODE) {
StrAllocCopy(command, linktext);
if (non_empty(linkargs)) {
HTSprintf(&command, " %s", linkargs);

124
lynx-build-fixes.patch
View File

@ -1,7 +1,113 @@
diff -up lynx2-8-6/src/makefile.in.jx lynx2-8-6/src/makefile.in
--- lynx2-8-6/src/makefile.in.jx 2006-08-31 19:37:53.000000000 -0400
+++ lynx2-8-6/src/makefile.in 2008-05-08 10:28:52.000000000 -0400
@@ -105,7 +105,7 @@ message:
diff --git a/makefile.in b/makefile.in
index d84837e..b245f38 100644
--- a/makefile.in
+++ b/makefile.in
@@ -96,8 +96,6 @@ COMPRESS_EXT=@COMPRESS_EXT@
# Path of scripts directory
scripts_dir=$(srcdir)/scripts
-MAKE_RECUR = $(MAKE) DESTDIR="$(DESTDIR)" CC="$(CC)"
-
# !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# To include resolv in the LIBS="" list for SUN 3, 4 or Solaris OS,
# point RESOLVLIB to that library. You need this if you get the message
@@ -189,13 +187,13 @@ SRC_CFLAGS = \
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 $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR)
+ $(MAKE) -C $(WWW_DIR) $(WWW_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) $@
+ $(MAKE) -C $(WWW_DIR) LINT="$(LINT)" $(WWW_CFLAGS) $@
+ $(MAKE) -C $(SRC_DIR) LINT="$(LINT)" $(SRC_CFLAGS) $@
help:
@echo
@@ -212,27 +210,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 alphatoc.html body.html cattoc.html tmp007
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
@@ -301,7 +299,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)/lynx$x ; then \
mv -f $(BINDIR)/lynx$x $(BINDIR)/lynx.old; fi'
@@ -361,7 +359,7 @@ install-help : help_files.sed $(HELPDIR)
- (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -fr *)
test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes
@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 alphatoc.html body.html cattoc.html
@LYNXCFG_MAKE@ sed -n -e '/Config_Type *Config_Table/,/{0, *0, *0}/ p' $(SRC_DIR)/LYReadCFG.i | \
@LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \
@@ -426,7 +424,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)/lynx$x
-rm -f $(MANDIR)/lynx.1
-rm -f $(SYSCONFDIR)/lynx.cfg
@@ -443,7 +441,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) $@
$(BINDIR) \
$(MANDIR) \
diff --git a/src/makefile.in b/src/makefile.in
index 4183bf0..d9c1587 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -110,7 +110,7 @@ message:
@echo "Compiling Lynx sources"
do_chartrans_stuff:
@ -10,27 +116,27 @@ diff -up lynx2-8-6/src/makefile.in.jx lynx2-8-6/src/makefile.in
SITE_DEFS="$(SITE_DEFS)" \
BUILD_CFLAGS="$(BUILD_CFLAGS)" \
BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
@@ -118,7 +118,7 @@ lint:
@@ -123,7 +123,7 @@ lint:
clean:
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_*
- cd chrtrans && $(MAKE) clean
+ $(MAKE) -C chstrans clean
tags:
ctags *.[ch]
@@ -185,8 +185,8 @@ TABLES= \
@@ -194,8 +194,8 @@ TABLES= \
$(CHRTR)utf8_uni.h \
$(CHRTR)viscii_uni.h
-$(TABLES):
- -cd chrtrans && $(MAKE) tables
+$(TABLES): chrtrans/makeuctb$(BUILD_EXEEXT)
+ -$(MAKE) -C chrtrans tables
+ $(MAKE) -C chrtrans tables
UCdomap$o : UCdomap.c \
chrtrans/UCkd.h \
@@ -195,7 +195,7 @@ UCdomap$o : UCdomap.c \
@@ -204,7 +204,7 @@ UCdomap$o : UCdomap.c \
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
chrtrans/makeuctb$(BUILD_EXEEXT):

35
lynx-crash.patch
View File

@ -1,35 +0,0 @@
diff -up lynx2-8-6/src/HTML.c.crash lynx2-8-6/src/HTML.c
--- lynx2-8-6/src/HTML.c.crash 2005-12-18 17:52:30.000000000 -0500
+++ lynx2-8-6/src/HTML.c 2008-08-07 14:00:57.000000000 -0400
@@ -6992,7 +6992,7 @@ static int HTML_end_element(HTStructured
case HTML_SELECT:
{
- char *ptr;
+ char *ptr = NULL;
/*
* Make sure we had a select start tag.
@@ -7032,13 +7032,15 @@ static int HTML_end_element(HTStructured
/*
* Finish the previous option.
*/
- ptr = HText_setLastOptionValue(me->text,
- me->option.data,
- me->LastOptionValue,
- LAST_ORDER,
- me->LastOptionChecked,
- me->UCLYhndl,
- ATTR_CS_IN);
+ if (!me->first_option)
+ ptr = HText_setLastOptionValue(me->text,
+ me->option.data,
+ me->LastOptionValue,
+ LAST_ORDER,
+ me->LastOptionChecked,
+ me->UCLYhndl,
+ ATTR_CS_IN);
+
FREE(me->LastOptionValue);
me->LastOptionChecked = FALSE;

96
lynx-more-build-fixes.patch
View File

@ -1,96 +0,0 @@
diff -Nur lynx2-8-6-orig/makefile.in lynx2-8-6/makefile.in
--- lynx2-8-6-orig/makefile.in 2006-09-03 18:25:39.000000000 -0500
+++ lynx2-8-6/makefile.in 2008-05-16 23:53:02.000000000 -0500
@@ -159,12 +159,12 @@
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 && $(MAKE) CC="$(CC)"
- cd $(WWWINC) && $(MAKE) CC="$(CC)" \
+@MSG_DIR_MAKE@ $(MAKE) -C po CC="$(CC)"
+ $(MAKE) -C $(WWWINC) CC="$(CC)" \
LY_CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LYFLAGS="$(SITE_LYDEFS)"
- cd src && $(MAKE) all CC="$(CC)" \
+ $(MAKE) -C src all CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \
@@ -173,11 +173,11 @@
WWWLIB="../$(WWWINC)/libwww.a"
lint:
- cd $(WWWINC) && $(MAKE) LINT="$(LINT)" CC="$(CC)" \
+ $(MAKE) -C $(WWWINC) LINT="$(LINT)" CC="$(CC)" \
LY_CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LYFLAGS="$(SITE_LYDEFS)" lint
- cd src && $(MAKE) all LINT="$(LINT)" CC="$(CC)" \
+ $(MAKE) -C src all LINT="$(LINT)" CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \
@@ -200,25 +200,25 @@
clean:
rm -f WWW/Library/*/*.[aoib]
rm -f WWW/Library/*/.created
- cd src && $(MAKE) clean
+ $(MAKE) -C src clean
@MSG_DIR_MAKE@ rm -f LYMessages.c
-@MSG_DIR_MAKE@ cd po && $(MAKE) $@
+@MSG_DIR_MAKE@ $(MAKE) -C po $@
rm -f *.b src/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
@LYNXCFG_MAKE@ -rm -f alphatoc.html body.html cattoc.html tmp007
rm -f help_files.sed
rm -f core *.core
depend: cfg_defs.h LYHelp.h
- cd $(WWWINC) && $(MAKE) $@
- cd src && $(MAKE) $@
+ $(MAKE) -C $(WWWINC) $@
+ $(MAKE) -C src $@
distclean: clean
-rm -f WWW/Library/*/*~
-rm -f WWW/Library/*/*.bak
-rm -rf src/obsolete
- -cd src && $(MAKE) $@
- -cd src/chrtrans && $(MAKE) $@
-@MSG_DIR_MAKE@ cd po && $(MAKE) $@
+ -$(MAKE) -C src $@
+ -$(MAKE) -C src/chrtrans $@
+@MSG_DIR_MAKE@ $(MAKE) -C po $@
@MSG_DIR_MAKE@ -rmdir po
-rm -f *~ *.bak *.sav tags TAGS
-rm -f $(WWWINC)/makefile src/makefile src/chrtrans/makefile
@@ -287,7 +287,7 @@
@echo Full installation complete.
install-bin: $(BINDIR) lynx$x
-@MSG_DIR_MAKE@ cd po && $(MAKE) CC="$(CC)" install
+@MSG_DIR_MAKE@ $(MAKE) -C po CC="$(CC)" install
-mv -f $(BINDIR)/lynx$x $(BINDIR)/lynx.old
$(INSTALL_PROGRAM) lynx$x $(BINDIR)/lynx$x
@@ -405,7 +405,7 @@
$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
uninstall ::
-@MSG_DIR_MAKE@ cd po && $(MAKE) CC="$(CC)" uninstall
+@MSG_DIR_MAKE@ $(MAKE) -C po CC="$(CC)" uninstall
-rm -f $(BINDIR)/lynx$x
-rm -f $(MANDIR)/lynx.1
-rm -f $(SYSCONFDIR)/lynx.cfg
diff -Nur lynx2-8-6-orig/src/makefile.in lynx2-8-6/src/makefile.in
--- lynx2-8-6-orig/src/makefile.in 2008-05-16 23:26:20.000000000 -0500
+++ lynx2-8-6/src/makefile.in 2008-05-17 00:20:31.000000000 -0500
@@ -195,7 +195,7 @@
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
chrtrans/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
LYCookie$o : $(top_srcdir)/userdefs.h

49
lynx.spec
View File

@ -1,42 +1,41 @@
Summary: A text-based Web browser
Name: lynx
Version: 2.8.6
Release: 22%{?dist}
Version: 2.8.7
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
Source: http://lynx.isc.org/current/lynx%{version}.tar.bz2
Source: http://lynx.isc.org/lynx%{version}/lynx%{version}.tar.bz2
URL: http://lynx.isc.org/
Patch0: lynx-2.8.6-redhat.patch
Patch1: lynx-crash.patch
Patch2: lynx-2.8.6-options.patch
Patch3: lynx-2.8.6-backgrcolor.patch
Patch4: lynx-2.8.6-fmt_string.patch
Patch5: lynx-build-fixes.patch
Patch6: lynx-more-build-fixes.patch
Patch7: lynx-CVE-2008-4690.patch
Patch1: lynx-2.8.6-backgrcolor.patch
Patch2: lynx-build-fixes.patch
Patch3: lynx-CVE-2008-4690.patch
Requires: indexhtml
Provides: webclient
Provides: text-www-browser
BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5,
BuildRequires: slang-devel, zlib-devel, gettext, rsh, telnet, zip, unzip
BuildRequires: gettext
BuildRequires: openssl-devel
BuildRequires: ncurses-devel
BuildRequires: rsh
BuildRequires: slang-devel
BuildRequires: telnet
BuildRequires: unzip
BuildRequires: zip
BuildRequires: zlib-devel
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Lynx is a text-based Web browser. Lynx does not display any images,
but it does support frames, tables, and most other HTML tags. One
advantage Lynx has over graphical browsers is speed; Lynx starts and
exits quickly and swiftly displays webpages.
exits quickly and swiftly displays web pages.
%prep
%setup -q -n lynx2-8-6
%patch0 -p1 -b .redhat
%patch1 -p1 -b .crash
%patch2 -p1 -b .opt
%patch3 -p1 -b .bgcol
%patch4 -p1 -b .fmt_string
%patch5 -p1 -b .build-fixes
%patch6 -p1 -b .more-build-fixes
%patch7 -p1 -b .CVE-2008-4690
%setup -q -n lynx2-8-7
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost/usr/share/doc/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg
perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg
perl -pi -e 's,^#LOCALE_CHARSET:.*,LOCALE_CHARSET:TRUE,' lynx.cfg
@ -108,6 +107,12 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
%changelog
* Tue Jan 05 2010 Kamil Dudka <kdudka@redhat.com> - 2.8.7-1
- new upstream release
- dropped applied patches
- fixed regression from #533004
- cleanup in BuildRequires
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.8.6-22
- rebuilt with new openssl

2
sources
View File

@ -1 +1 @@
bd44c57d28fd3e4c9db1cd492d403600 lynx2.8.6.tar.bz2
493af4c77ef6761e3f0157cd1be033a0 lynx2.8.7.tar.bz2