rpms/lynx/devel lynx-2.8.7-bm-del.patch, NONE, 1.1 lynx-build-fixes.patch, 1.2, 1.3 lynx.spec, 1.61, 1.62

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/lynx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18199

Modified Files:
	lynx-build-fixes.patch lynx.spec 
Added Files:
	lynx-2.8.7-bm-del.patch 
Log Message:
- 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 6d3a9ca..deaab00 100644
--- a/src/LYBookmark.c
+++ b/src/LYBookmark.c
@@ -496,7 +496,7 @@ void remove_bookmark_link(int cur,
      */
     if (stat(filename_buffer, &stat_buf) == 0) {
 	regular = (BOOLEAN) (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-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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lynx-build-fixes.patch	5 Jan 2010 16:45:07 -0000	1.2
+++ lynx-build-fixes.patch	13 Jan 2010 08:57:50 -0000	1.3
@@ -121,7 +121,7 @@ index 4183bf0..d9c1587 100644
  clean:
  	rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_*
 -	cd chrtrans && $(MAKE) clean
-+	$(MAKE) -C chstrans clean
++	$(MAKE) -C chrtrans clean
  
  tags:
  	ctags *.[ch]


Index: lynx.spec
===================================================================
RCS file: /cvs/extras/rpms/lynx/devel/lynx.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- lynx.spec	5 Jan 2010 16:51:06 -0000	1.61
+++ lynx.spec	13 Jan 2010 08:57:50 -0000	1.62
@@ -10,6 +10,7 @@ Patch0: lynx-2.8.6-redhat.patch
 Patch1: lynx-2.8.6-backgrcolor.patch
 Patch2: lynx-build-fixes.patch
 Patch3: lynx-CVE-2008-4690.patch
+Patch4: lynx-2.8.7-bm-del.patch
 Provides: webclient
 Provides: text-www-browser
 BuildRequires: gettext
@@ -31,10 +32,27 @@ exits quickly and swiftly displays web p
 
 %prep
 %setup -q -n lynx2-8-7
+
+# RH specific tweaks - directory layout, utf-8 by default, misc. configuration
+# and home page
 %patch0 -p1
+
+# tweaks colors
 %patch1 -p1
+
+# patch preparing upstream sources for rpmbuild, in particular for parallel make
 %patch2 -p1
+
+# 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 and set
+# TRUSTED_LYNXCGI:none in lynx.cfg to disable all lynxcgi URLs by default
+# [CVE-2008-4690]
 %patch3 -p1
+
+# make it possible to delete a bookmark when ~/lynx_bookmarks.html is writable
+# by group (#486070)
+%patch4 -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
@@ -106,6 +124,10 @@ 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.7-2
+- make it possible to delete a bookmark when ~/lynx_bookmarks.html is writable
+  by group (#486070)
+
 * Tue Jan 05 2010 Kamil Dudka <kdudka at redhat.com> - 2.8.7-1
 - new upstream release
 - dropped applied patches