rpms/lynx/F-12 lynx-2.8.7-bm-del.patch, NONE, 1.1 lynx-2.8.6-fmt_string.patch, 1.1, 1.2 lynx-CVE-2008-4690.patch, 1.1, 1.2 lynx.spec, 1.60, 1.61
Kamil Dudka
kdudka at fedoraproject.org
Wed Jan 13 12:01:57 UTC 2010
Author: kdudka
Update of /cvs/extras/rpms/lynx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16735
Modified Files:
lynx-2.8.6-fmt_string.patch lynx-CVE-2008-4690.patch lynx.spec
Added Files:
lynx-2.8.7-bm-del.patch
Log Message:
- updated sources URL
- cleanup in BuildRequires
- rediffed patches with non-zero offset
- make it possible to delete a bookmark when ~/lynx_bookmarks.html is writable by group (#486070)
lynx-2.8.7-bm-del.patch:
LYBookmark.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE lynx-2.8.7-bm-del.patch ---
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
index 2a00a1b..960f56d 100644
--- a/src/LYBookmark.c
+++ b/src/LYBookmark.c
@@ -493,7 +493,7 @@ void remove_bookmark_link(int cur,
*/
if (stat(filename_buffer, &stat_buf) == 0) {
regular = (S_ISREG(stat_buf.st_mode) && stat_buf.st_nlink == 1);
- mode = ((stat_buf.st_mode & 0777) | 0600); /* make it writable */
+ mode = ((stat_buf.st_mode & HIDE_CHMOD) | 0600); /* make it writable */
(void) chmod(newfile, mode);
if ((nfp = LYReopenTemp(newfile)) == NULL) {
(void) LYCloseInput(fp);
lynx-2.8.6-fmt_string.patch:
HTString.c | 65 ++++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 43 insertions(+), 22 deletions(-)
Index: lynx-2.8.6-fmt_string.patch
===================================================================
RCS file: /cvs/extras/rpms/lynx/F-12/lynx-2.8.6-fmt_string.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lynx-2.8.6-fmt_string.patch 9 Jan 2008 12:13:52 -0000 1.1
+++ lynx-2.8.6-fmt_string.patch 13 Jan 2010 12:01:56 -0000 1.2
@@ -1,6 +1,8 @@
---- 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 @@
+diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
+index e212c6f..7ee64ac 100644
+--- a/WWW/Library/Implementation/HTString.c
++++ b/WWW/Library/Implementation/HTString.c
+@@ -551,6 +551,46 @@ PUBLIC_IF_FIND_LEAKS char *StrAllocVsprintf(char **pstr,
const char *fmt,
va_list * ap)
{
@@ -47,7 +49,7 @@
#ifdef SAVE_TIME_NOT_SPACE
static size_t tmp_len = 0;
static size_t fmt_len = 0;
-@@ -634,20 +674,9 @@
+@@ -566,20 +606,9 @@ PUBLIC_IF_FIND_LEAKS char *StrAllocVsprintf(char **pstr,
char *dst_ptr = *pstr;
const char *format = fmt;
@@ -69,7 +71,7 @@
need = strlen(fmt) + 1;
#ifdef SAVE_TIME_NOT_SPACE
if (!fmt_ptr || fmt_len < need * NUM_WIDTH) {
-@@ -848,6 +877,7 @@
+@@ -780,6 +809,7 @@ PUBLIC_IF_FIND_LEAKS char *StrAllocVsprintf(char **pstr,
if (pstr)
*pstr = dst_ptr;
return (dst_ptr);
@@ -77,7 +79,7 @@
}
#undef SAVE_TIME_NOT_SPACE
-@@ -895,16 +925,7 @@
+@@ -827,16 +857,7 @@ char *HTSprintf0(char **pstr, const char *fmt,...)
LYva_start(ap, fmt);
{
lynx-CVE-2008-4690.patch:
CHANGES | 6 ++++++
lynx.cfg | 2 +-
src/LYCgi.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
Index: lynx-CVE-2008-4690.patch
===================================================================
RCS file: /cvs/extras/rpms/lynx/F-12/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 13 Jan 2010 12:01:57 -0000 1.2
@@ -1,5 +1,7 @@
---- 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
+diff --git a/CHANGES b/CHANGES
+index 9d8e9f6..ff12253 100644
+--- a/CHANGES
++++ b/CHANGES
@@ -1,5 +1,11 @@
Changes since Lynx 2.8 release
===============================================================================
@@ -12,20 +14,11 @@
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
+diff --git a/lynx.cfg b/lynx.cfg
+index f5b85ae..a779111 100644
+--- a/lynx.cfg
++++ b/lynx.cfg
+@@ -1029,7 +1029,7 @@ CHARACTER_SET:utf-8
# ====
# Do not define this.
#
@@ -34,3 +27,16 @@
.h2 LYNXCGI_ENVIRONMENT
+diff --git a/src/LYCgi.c b/src/LYCgi.c
+index 1d07802..867478f 100644
+--- a/src/LYCgi.c
++++ b/src/LYCgi.c
+@@ -165,7 +165,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 if (user_mode < ADVANCED_MODE) {
++ } else {
+ StrAllocCopy(command, linktext);
+ if (non_empty(linkargs)) {
+ HTSprintf(&command, " %s", linkargs);
Index: lynx.spec
===================================================================
RCS file: /cvs/extras/rpms/lynx/F-12/lynx.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- lynx.spec 6 Nov 2009 13:13:02 -0000 1.60
+++ lynx.spec 13 Jan 2010 12:01:57 -0000 1.61
@@ -1,10 +1,10 @@
Summary: A text-based Web browser
Name: lynx
Version: 2.8.6
-Release: 23%{?dist}
+Release: 24%{?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
@@ -14,28 +14,37 @@ 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
+Patch8: lynx-2.8.7-bm-del.patch
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
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -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
@@ -107,6 +116,13 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
%changelog
+* Wed Jan 13 2010 Kamil Dudka <kdudka at redhat.com> - 2.8.6-24
+- updated sources URL
+- cleanup in BuildRequires
+- rediffed patches with non-zero offset
+- make it possible to delete a bookmark when ~/lynx_bookmarks.html is writable
+ by group (#486070)
+
* Fri Nov 6 2009 Jiri Moskovcak <jmoskovc at redhat.com> - 2.8.6-23
- removed dependency on indexthml
- changed default homepage to start.fedoraproject.org
More information about the scm-commits
mailing list