rpms/lynx/devel .cvsignore, 1.9, 1.10 lynx-2.8.6-backgrcolor.patch, 1.1, 1.2 lynx-2.8.6-redhat.patch, 1.2, 1.3 lynx-CVE-2008-4690.patch, 1.1, 1.2 lynx-build-fixes.patch, 1.1, 1.2 lynx.spec, 1.59, 1.60 sources, 1.10, 1.11 lynx-2.8.6-fmt_string.patch, 1.1, NONE lynx-2.8.6-options.patch, 1.1, NONE lynx-crash.patch, 1.3, NONE lynx-more-build-fixes.patch, 1.1, NONE
Kamil Dudka
kdudka at fedoraproject.org
Tue Jan 5 16:45:08 UTC 2010
Author: kdudka
Update of /cvs/extras/rpms/lynx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31888
Modified Files:
.cvsignore lynx-2.8.6-backgrcolor.patch
lynx-2.8.6-redhat.patch lynx-CVE-2008-4690.patch
lynx-build-fixes.patch lynx.spec sources
Removed Files:
lynx-2.8.6-fmt_string.patch lynx-2.8.6-options.patch
lynx-crash.patch lynx-more-build-fixes.patch
Log Message:
- new upstream release
- dropped applied patches
- fixed regression from #533004
- cleanup in BuildRequires
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 24 Oct 2006 09:37:17 -0000 1.9
+++ .cvsignore 5 Jan 2010 16:45:06 -0000 1.10
@@ -1 +1 @@
-lynx2.8.6.tar.bz2
+lynx2.8.7.tar.bz2
lynx-2.8.6-backgrcolor.patch:
lynx.lss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: lynx-2.8.6-backgrcolor.patch
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/lynx-2.8.6-backgrcolor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lynx-2.8.6-backgrcolor.patch 11 Dec 2007 09:45:39 -0000 1.1
+++ lynx-2.8.6-backgrcolor.patch 5 Jan 2010 16:45:06 -0000 1.2
@@ -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
lynx-2.8.6-redhat.patch:
lynx.cfg | 13 ++++++++++---
userdefs.h | 16 ++++++++--------
2 files changed, 18 insertions(+), 11 deletions(-)
Index: lynx-2.8.6-redhat.patch
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/lynx-2.8.6-redhat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lynx-2.8.6-redhat.patch 7 Aug 2008 18:03:24 -0000 1.2
+++ lynx-2.8.6-redhat.patch 5 Jan 2010 16:45:07 -0000 1.3
@@ -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
+# 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
.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
.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
.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 lyn
#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 lyn
/**************************
* 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 lyn
#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 lyn
#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 lyn
/**************************
* 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 lyn
/********************************
* 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
lynx-CVE-2008-4690.patch:
CHANGES | 8 +++++++-
lynx.cfg | 2 +-
src/LYCgi.c | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
Index: lynx-CVE-2008-4690.patch
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/lynx-CVE-2008-4690.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lynx-CVE-2008-4690.patch 7 Nov 2008 13:50:50 -0000 1.1
+++ lynx-CVE-2008-4690.patch 5 Jan 2010 16:45:07 -0000 1.2
@@ -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);
lynx-build-fixes.patch:
makefile.in | 38 ++++++++++++++++++--------------------
src/makefile.in | 10 +++++-----
2 files changed, 23 insertions(+), 25 deletions(-)
Index: lynx-build-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/lynx-build-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lynx-build-fixes.patch 29 May 2008 14:25:47 -0000 1.1
+++ lynx-build-fixes.patch 5 Jan 2010 16:45:07 -0000 1.2
@@ -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
+- at MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR)
+- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
+- cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
++ at 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
+- at MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@
++ at 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) $@
+- at MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@
++ $(MAKE) -C $(WWW_DIR) $@
++ $(MAKE) -C $(SRC_DIR) $@
++ $(MAKE) -C $(CHR_DIR) $@
++ at 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
+- at MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) install
++ at 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'
+- at LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
++ at 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 ::
+- at MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall
++ at 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 ly
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):
Index: lynx.spec
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/lynx.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- lynx.spec 21 Aug 2009 14:27:21 -0000 1.59
+++ lynx.spec 5 Jan 2010 16:45:07 -0000 1.60
@@ -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 at 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 at redhat.com> - 2.8.6-22
- rebuilt with new openssl
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 29 May 2008 14:25:47 -0000 1.10
+++ sources 5 Jan 2010 16:45:07 -0000 1.11
@@ -1 +1 @@
-bd44c57d28fd3e4c9db1cd492d403600 lynx2.8.6.tar.bz2
+493af4c77ef6761e3f0157cd1be033a0 lynx2.8.7.tar.bz2
--- lynx-2.8.6-fmt_string.patch DELETED ---
--- lynx-2.8.6-options.patch DELETED ---
--- lynx-crash.patch DELETED ---
--- lynx-more-build-fixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list